Merge pull request #1441 from LLNL/feature/kweiss/optional-opencascade-dep

Adds opencascade as an optional dependency

Author: kennyweiss

RELEASE-NOTES.md

@@ -21,6 +21,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 
 ###  Added
 - `sidre::View` holding array data may now be re-shaped.  See `sidre::View::reshapeArray`.
+- Adds optional dependency on [Open CASCADE](https://dev.opencascade.org). The initial intention is 
+to use Open CASCADE's file I/O capabilities in support of Quest applications.
 
 ###  Changed
 - Importing Conduit array data into `sidre::View` now allocates destination
@@ -36,6 +38,9 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 ###  Removed
 
 ###  Fixed
+- Fixes compilation issue with [email protected] on 32-bit Windows configurations. 
+This required a [RAJA fix to avoid 64-bit intrinsics](https://github.com/LLNL/RAJA/pull/1746), 
+as well as support for 32-bit `Word`s in Slam's `BitSet` class.
 
 ## [Version 0.10.1] - Release date 2024-10-22
 

host-configs/[email protected]

@@ -278,6 +278,34 @@ spack:
       - spec: [email protected]
         prefix: /usr
 
+    # External dependencies for opencascade
+    # Couldn't find the exact versions for the libx* libraries, so copied from toss4 versions
+    mesa:
+      buildable: False
+      externals:
+      - spec: [email protected]  # found via: glxinfo | grep -i version
+        prefix: /
+    libxi:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxt:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxext:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxmu:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+
     # External dependencies for SCR
     lsf:
       buildable: False
@@ -323,6 +351,8 @@ spack:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
 
     # Globally lock in versions of Devtools
     cmake:

host-configs/[email protected]

@@ -89,6 +89,31 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /usr
+    mesa:
+      buildable: False
+      externals:
+      - spec: [email protected]  # found via: glxinfo | grep -i version
+        prefix: /usr          
+    libxi:
+      buildable: False
+      externals:
+      - spec: [email protected] # found via: strings /usr/lib64/libXi.so | grep -i "libXi"
+        prefix: /usr
+    libxt:
+      buildable: False
+      externals:
+      - spec: [email protected] # found via: strings /usr/lib64/libXt.so | grep -i "libXt"
+        prefix: /usr
+    libxext:
+      buildable: False
+      externals:
+      - spec: [email protected] # found via: strings /usr/lib64/libXext.so | grep -i "libXext"
+        prefix: /usr
+    libxmu:
+      buildable: False
+      externals:
+      - spec: [email protected] # found via: strings /usr/lib64/libXmu.so | grep -i "libXmu"
+        prefix: /usr
 
     # Lock down which MPI we are using
     mpi:
@@ -293,6 +318,8 @@ spack:
       require: "@3.0.1~shared~tests~examples"
     umpire:
       require: "@2024.07.0~shared~examples~werror"
+    opencascade:
+      require: "@7.8.1+data_exchange~draw"
 
   # Lock in versions of Devtools
     cmake:

host-configs/[email protected]

@@ -420,6 +420,34 @@ spack:
       - spec: [email protected]
         prefix: /usr
 
+    # External dependencies for opencascade
+    # libx* versions found via `strings /path/to/libx*.so
+    mesa:
+      buildable: False
+      externals:
+      - spec: [email protected]  # found via: glxinfo | grep -i version
+        prefix: /
+    libxi:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxt:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxext:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+    libxmu:
+      buildable: False
+      externals:
+      - spec: [email protected]
+        prefix: /
+
     # External dependencies for SCR
     lsf:
       buildable: False

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -92,7 +92,8 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
         description="Build with hooks for Adiak/Caliper performance analysis",
     )
 
-    variant("c2c",      default=False, description="Build with c2c")
+    variant("c2c", default=False, description="Build with c2c")
+    variant("opencascade", default=False, description="Build with opencascade")
 
     variant("mfem", default=False, description="Build with mfem")
     variant("hdf5", default=True, description="Build with hdf5")
@@ -180,6 +181,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     depends_on("rocprim", when="+rocm")
 
     depends_on("c2c", when="+c2c")
+    depends_on("opencascade", when="+opencascade")
 
     with when("+mfem"):
         depends_on("mfem+mpi", when="+mpi")
@@ -489,7 +491,7 @@ def initconfig_package_entries(self):
         entries.append(cmake_cache_path("CONDUIT_DIR", conduit_dir))
 
         # optional tpls
-        for dep in ("c2c", "mfem", "hdf5", "lua", "raja", "umpire"):
+        for dep in ("c2c", "mfem", "hdf5", "lua", "raja", "umpire", "opencascade"):
             if "+%s" % dep in spec:
                 dep_dir = get_spec_path(spec, dep, path_replacements)
                 entries.append(cmake_cache_path("%s_DIR" % dep.upper(), dep_dir))

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -15,7 +15,7 @@
 
     "toss_4_x86_64_ib":
     [ "[email protected]+devtools+hdf5+mfem+c2c+scr+profiling",
-      "[email protected]+devtools+hdf5+mfem+c2c+scr+profiling",
+      "[email protected]+devtools+hdf5+mfem+c2c+scr+profiling+opencascade",
       "[email protected]+devtools+hdf5+mfem+c2c+profiling" ],
 
     "__comment__":"# Use amdgpu_target=gfx942 for rzadams",

scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml

@@ -167,6 +167,12 @@ set(_umpire_dep [=[
 set(UMPIRE_DIR "@CURRENT_INSTALLED_DIR@" CACHE PATH "")
 ]=])
 
+
+set(_opencascade_dep [=[
+
+set(OPENCASCADE_DIR "@CURRENT_INSTALLED_DIR@" CACHE PATH "")
+]=])
+
 set(_openmp_dep [=[
 
 # Setup OpenMP; fix MSVC linker error about unknown flag
@@ -198,7 +204,7 @@ else()
   file(APPEND ${_hc_file}.in "${_conduit_dep_off}")
 endif()
 
-foreach(_dep lua mfem openmp raja umpire)
+foreach(_dep lua mfem openmp raja umpire opencascade)
   if(${_dep} IN_LIST FEATURES)
     file(APPEND ${_hc_file}.in "${_${_dep}_dep}")
   else()