Adds opencascade as an optional dependency #1441

kennyweiss · 2024-10-08T21:05:46Z

Summary

This PR is a feature
It adds opencascade as an optional axom dependency
We're planning to use this mainly to import mesh formats, such as STEP files

TODO

Add Windows support through vcpkg
Enable this in at least one CI plan
Update documentation

kennyweiss · 2024-10-11T23:28:27Z

/style

Only currently tested on LLNL's toss4.

Misc: Fixes typo in comments about exported targets

Includes a test for reading and writing STEP files.

I am not sure why this has not shown up previously.

I had to copy the opencascade port files from vcpkg to * remove the default-dependency on freetype * patch a typo where a number was being quoted in a CMake file

Patch is from A. Dayton and is slightly past [email protected]

…ed with a query point

The candidates are currently returned as a std::vector. Misc: Uses locales to improve output of these tests.

…nt on LC

…n LC

kennyweiss · 2024-10-15T05:14:28Z

host-configs/[email protected]

-set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.07.0-4bdhkgxmckkcfnhfv76gutbzn7gzrcum" CACHE PATH "")
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.07.0-et2uff5thiprgch43uftatndduzssxay" CACHE PATH "")
+
+set(OPENCASCADE_DIR "${TPL_ROOT}/opencascade-7.8.1-epyyoyevoozkzqoxdqxku2q4anwlqw52" CACHE PATH "")


I tested configs on all platforms w/ opencascade, but only enabled it on a single toss4 config on LC.
I also enabled opencascade in Windows configs.

kennyweiss · 2024-10-15T05:16:13Z

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

+      buildable: False
+      externals:
+      - spec: [email protected]  # found via: glxinfo | grep -i version
+        prefix: /


@white238 -- the opengl and X libraries were in /lib64 on toss4_cray and blueos, so I made the prefix / instead of /usr. Is that the correct prefix? I tested this w/ one of our blueos configs and it worked.

kennyweiss · 2024-10-15T05:18:35Z

scripts/vcpkg_ports/opencascade/portfile.cmake

+### BEGIN AXOM PATCH
+
+# replace a quoted number in a flag -- /wd"26812" with /wd26812
+set(_file "${SOURCE_PATH}/adm/cmake/occt_defs_flags.cmake")
+file(READ "${_file}" _filedata)
+string(REPLACE [[/wd\"26812\"]] [[/wd26812]] _filedata "${_filedata}")
+file(WRITE "${_file}" "${_filedata}")
+### END AXOM PATCH


Note: I had to copy the whole opencascade portfile to add this patch, which converts /wd"26812" to /wd26812

kennyweiss · 2024-10-15T05:21:24Z

scripts/vcpkg_ports/opencascade/vcpkg.json

+      "host": true
+    }
+  ],
+  "default-features": [],


Note: I copied the opencascade portfile from vcpkg to remove the freetype default-feature.
More direct ways to do this would involve updates to uberenv to have a project package file.

Compare to:
https://github.com/microsoft/vcpkg/blob/98ffd29b9e6a07db04a0899d1be351e9e3bd1e54/ports/opencascade/vcpkg.json#L27-L32

kennyweiss · 2024-10-15T05:23:07Z

scripts/vcpkg_ports/raja/portfile.cmake

+    REF 85c58eb7d25ac5a7ff1c6a3cc6bb74bf8351e36e # HEAD of bugfix/dayton8/win32 branch; a bit past v2024.07.0
+    SHA512 263346ff91c17f48fa40efdd6826331e1fecb995fef289bf997500d058c57e4dc706512baa8fc5dfc912c54939b973c56c8677a4705e261a2740c55851446341


Note: This points to @adayton1's bugfix commit -- LLNL/RAJA#1746

I can update it to the current HEAD of raja@develop now that the PR is merged (or leave it as is).

I'm OK with either. If users need this, I can tag a patch release for RAJA because Mike C. won't build any TPL sets that don't point at releases.

Please let me know if I should do a RAJA release.

kennyweiss · 2024-10-15T05:24:54Z

src/axom/quest/detail/PointFinder.hpp

@@ -351,6 +352,11 @@ class PointFinder
    return m_cellBBoxes[cellIdx];
  }

+  std::vector<IndexType> getCandidates(SpacePoint const& pt) const
+  {
+    return m_grid.getCandidatesAsArray(pt);


Note: ImplicitGrid returns a std::vector for its getCandidatesAsArray. We should probably change this to an axom::Array so it's amenable w/ usage on a device.

kennyweiss · 2024-10-15T05:25:47Z

src/axom/slam/BitSet.hpp

+#if(defined(__x86_64__) && defined(__GNUC__)) || \
+  (defined(_WIN64) && (_MSC_VER >= 1600))
  using Word = std::uint64_t;
+#else
+  using Word = std::uint32_t;
+#endif


Note: BitSet now uses 32-bit words in x86 mode on windows.

kennyweiss · 2024-10-15T05:26:39Z

src/axom/spin/ImplicitGrid.hpp

+    const int numBits =
+      axom::utilities::min(bitsPerWord, nbits - (iword * bitsPerWord));


Note: I lost way too much time trying to track down this bug! It hardcoded 64-bit words for the underlying slam::BitSet!

agcapps · 2024-10-17T21:58:40Z

Thank you for this work, @kennyweiss . So far it looks good. What docs do you plan to add?

kennyweiss changed the title ~~pwdFeature/kweiss/optional opencascade dep~~ Adds opencascade as an optional dependency Oct 8, 2024

kennyweiss marked this pull request as draft October 8, 2024 21:08

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from f5c930e to ba9bf06 Compare October 11, 2024 23:27

kennyweiss mentioned this pull request Oct 14, 2024

Builtin atomic fixes for 32 bit windows LLNL/RAJA#1746

Merged

kennyweiss and others added 21 commits October 14, 2024 21:10

Adds optional opencascade support to axom's spack setup

1c01767

Only currently tested on LLNL's toss4.

Fix warning about unused variable

542ee5c

Import opencascade target when OPENCASCADE_DIR is provided

e793d90

Adds AXOM_USE_OPENCASCADE to config.hpp and CMake export set

8cd01d0

Misc: Fixes typo in comments about exported targets

Adds a smoke test for optional opencascade dependency

3fa98d6

Includes a test for reading and writing STEP files.

Fixes MSVC compilation error related to wide strings

4bb9793

I am not sure why this has not shown up previously.

vcpkg: Adds optional dependency on opencascade

763f32e

I had to copy the opencascade port files from vcpkg to * remove the default-dependency on freetype * patch a typo where a number was being quoted in a CMake file

vcpkg: Use patched RAJA branch fixing intrinsics for x86 configs

b4d709f

Patch is from A. Dayton and is slightly past [email protected]

Use 32-bit words for BitSet in x86 mode

f82a3d2

Adds missing slam::BitSet tests for atomic update operations

940a649

Bugfix to ImplicitGrid when using 32-bit Words in BitSet

234509c

Adds function to quest::PointFinder to return the candidates associat…

2804109

…ed with a query point

Improves testing of quest PointInCell functionality

7dba9e3

Apply style updates

6354cd0

Fixes usage of templated type from parent in point in cell tests

c555e9e

Fixes warnings about unused variables in device code

73c52ff

For point in cell tests, only check candidates when running on host

80bbe40

The candidates are currently returned as a std::vector. Misc: Uses locales to improve output of these tests.

Enables opencascade variant in Axom's toss4-clang configuration on LC

56bb454

Updates toss4 host-configs for rzwhippet

9c5a48b

Adds spack externals for opencascade deps to the toss4_cray environme…

1e60e73

…nt on LC

Adds spack externals for opencascade deps to the blueos environment o…

4d1304e

…n LC

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from 27552e8 to 4d1304e Compare October 15, 2024 04:11

kennyweiss marked this pull request as ready for review October 15, 2024 04:11

kennyweiss self-assigned this Oct 15, 2024

kennyweiss requested a review from rhornung67 October 15, 2024 04:12

kennyweiss requested review from agcapps, publixsubfan, white238, cyrush, wnissen, BradWhitlock, jcs15c and bmhan12 October 15, 2024 04:12

kennyweiss added TPL Issues related to Axom's third party libraries Build system Issues related to Axom's build system labels Oct 15, 2024

kennyweiss commented Oct 15, 2024

View reviewed changes

Updates host-configs for toss4 ruby

1b1cb8f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds opencascade as an optional dependency #1441

Adds opencascade as an optional dependency #1441

kennyweiss commented Oct 8, 2024 •

edited

Loading

kennyweiss commented Oct 11, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024 •

edited

Loading

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

rhornung67 Oct 15, 2024 •

edited

Loading

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

agcapps commented Oct 17, 2024

		REF 85c58eb7d25ac5a7ff1c6a3cc6bb74bf8351e36e # HEAD of bugfix/dayton8/win32 branch; a bit past v2024.07.0
		SHA512 263346ff91c17f48fa40efdd6826331e1fecb995fef289bf997500d058c57e4dc706512baa8fc5dfc912c54939b973c56c8677a4705e261a2740c55851446341

		const int numBits =
		axom::utilities::min(bitsPerWord, nbits - (iword * bitsPerWord));

Adds opencascade as an optional dependency #1441

Are you sure you want to change the base?

Adds opencascade as an optional dependency #1441

Conversation

kennyweiss commented Oct 8, 2024 • edited Loading

Summary

TODO

kennyweiss commented Oct 11, 2024

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

rhornung67 Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024

Choose a reason for hiding this comment

agcapps commented Oct 17, 2024

kennyweiss commented Oct 8, 2024 •

edited

Loading

kennyweiss Oct 15, 2024 •

edited

Loading

rhornung67 Oct 15, 2024 •

edited

Loading