From 7a85d433719c167c3d4345af09cbd24107231bbf Mon Sep 17 00:00:00 2001 From: Paul Wilson Date: Sat, 5 Oct 2024 17:53:11 -0500 Subject: [PATCH 01/35] Advance version titles in CHANGELOG --- doc/CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 2a3cd5c06..bb71f5970 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -7,6 +7,9 @@ DAGMC Changelog Next version ==================== +v3.2.4 +==================== + **Changed:** * Adding info messages to CMake output for double down (#962) From 43811cb58c08a5f0a35611238142ce289f8c3054 Mon Sep 17 00:00:00 2001 From: Paul Wilson Date: Sat, 5 Oct 2024 17:53:46 -0500 Subject: [PATCH 02/35] Advance version number in CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ab2034a1..26d3263d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ enable_language(CXX) # Set DAGMC version set(DAGMC_MAJOR_VERSION 3) set(DAGMC_MINOR_VERSION 2) -set(DAGMC_PATCH_VERSION 3) +set(DAGMC_PATCH_VERSION 4) set(DAGMC_VERSION ${DAGMC_MAJOR_VERSION}.${DAGMC_MINOR_VERSION}.${DAGMC_PATCH_VERSION}) if(MSVC) From a6c4cbac01004af69d64a76c4b03a85d75c2d3fa Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Fri, 22 Nov 2024 11:50:36 -0600 Subject: [PATCH 03/35] unpin HDF5 for Windows --- .github/workflows/windows_build_test.yml | 2 +- doc/CHANGELOG.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 442a931ae..cea5b1816 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5=1.10.6 + conda install -c conda-forge hdf5 conda remove -y yaml-cpp - name: Environment Variables diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index bb71f5970..c7ce6639f 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -13,7 +13,7 @@ v3.2.4 **Changed:** * Adding info messages to CMake output for double down (#962) - * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933) + * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933 #9??) * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935) * Update MOAB to 5.5.1 from 5.3.0 (#939 #940) * Update README regarding OpenMC (#938) From cc00907602a896fb64b448f53152173ba4c8f60a Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Fri, 22 Nov 2024 12:02:33 -0600 Subject: [PATCH 04/35] don't remove yaml-cpp --- .github/workflows/windows_build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index cea5b1816..9dc8b4d19 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -50,7 +50,6 @@ jobs: run: | conda install curl eigen conda install -c conda-forge hdf5 - conda remove -y yaml-cpp - name: Environment Variables shell: bash -l {0} From d6791fc6e8cdb585ae8c72f44bac9a98fa6149fa Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Fri, 22 Nov 2024 12:07:28 -0600 Subject: [PATCH 05/35] force brew install overwrite --- .github/workflows/mac_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 354dc42f1..c35cd058f 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -47,7 +47,7 @@ jobs: - name: Initial setup shell: bash -l {0} run: | - brew install eigen hdf5 + brew install --overwrite eigen hdf5 - name: Environment Variables shell: bash -l {0} From 787b8420545b54ba67509a6efa092c48234180a3 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Fri, 22 Nov 2024 12:12:24 -0600 Subject: [PATCH 06/35] force instead of overwrite in brew --- .github/workflows/mac_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index c35cd058f..818710ef1 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -47,7 +47,7 @@ jobs: - name: Initial setup shell: bash -l {0} run: | - brew install --overwrite eigen hdf5 + brew install --force eigen hdf5 - name: Environment Variables shell: bash -l {0} From 1d315f95e37350073eea9ed8c797f4631a066f81 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 16:01:27 +0600 Subject: [PATCH 07/35] remove force --- .github/workflows/mac_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 818710ef1..354dc42f1 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -47,7 +47,7 @@ jobs: - name: Initial setup shell: bash -l {0} run: | - brew install --force eigen hdf5 + brew install eigen hdf5 - name: Environment Variables shell: bash -l {0} From 91c7f592a660ca4244e302d46a79dbdfc5aedf4b Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 16:12:58 +0600 Subject: [PATCH 08/35] set hdf5 to 1.10.6 --- .github/workflows/windows_build_test.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 9dc8b4d19..9af486a9c 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5 + conda install -c conda-forge hdf5=1.10.6 - name: Environment Variables shell: bash -l {0} @@ -77,14 +77,9 @@ jobs: -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DEIGEN3_DIR="${CONDA_LOC}/include/eigen3" \ -DHDF5_ROOT="${CONDA_LOC}" \ - -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ - -DCMAKE_EXE_LINKER_FLAGS="/std:c++latest -DH5_BUILT_AS_DYNAMIC_LIB" \ - -DCMAKE_MODULE_LINKER_FLAGS="/std:c++latest" \ - -DCMAKE_SHARED_LINKER_FLAGS="/std:c++latest" \ + -DHDF5_LIBRARIES="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ -DCMAKE_STATIC_LINKER_FLAGS="" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" \ - -DCMAKE_CXX_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" + -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release cmake --install . --config Release @@ -112,7 +107,7 @@ jobs: -DBUILD_TESTS=ON \ -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ - -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ + -DHDF5_LIBRARIES="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_MODULE_LINKER_FLAGS="" \ From 0acb3b97ea50a6c70b3cb544436ee332c34155e3 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 16:52:45 +0600 Subject: [PATCH 09/35] Use DAGMC's FindMOAB --- .github/workflows/windows_build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 9af486a9c..0eca5b727 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -107,7 +107,6 @@ jobs: -DBUILD_TESTS=ON \ -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ - -DHDF5_LIBRARIES="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_MODULE_LINKER_FLAGS="" \ From eaaab09e6914970ee6fca30b7a832db64e981fdf Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 17:05:31 +0600 Subject: [PATCH 10/35] remove set(HDF5_LIBRARIES) --- cmake/FindMOAB.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake index 92602c891..ebf06fb66 100644 --- a/cmake/FindMOAB.cmake +++ b/cmake/FindMOAB.cmake @@ -33,7 +33,6 @@ endif () if (NOT BUILD_SHARED_LIBS) set(HDF5_LIBRARIES_SHARED) endif () -set(HDF5_LIBRARIES) message(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}") message(STATUS "HDF5_LIBRARIES_SHARED: ${HDF5_LIBRARIES_SHARED}") From c1d6ebfb1af2241e0241488b26c852140dbe0ba0 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 17:14:35 +0600 Subject: [PATCH 11/35] DHDF5_DIR --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 0eca5b727..8293095c1 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -106,7 +106,7 @@ jobs: -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ -DMOAB_DIR=../install_dir \ - -DHDF5_ROOT="${CONDA_LOC}" \ + -DHDF5_DIR="${CONDA_LOC}" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_MODULE_LINKER_FLAGS="" \ From f78744ac3b88c3a3b67961af54bbd834f3ecdc98 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 19:51:53 +0600 Subject: [PATCH 12/35] DCMAKE_PREFIX_PATH --- .github/workflows/windows_build_test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 8293095c1..bd32d78d8 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -105,8 +105,7 @@ jobs: -DBUILD_MAKE_WATERTIGHT=ON \ -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ - -DMOAB_DIR=../install_dir \ - -DHDF5_DIR="${CONDA_LOC}" \ + -DCMAKE_PREFIX_PATH="${CONDA_LOC}" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_MODULE_LINKER_FLAGS="" \ From 603d67abb76abea393ed8197b2bb4cd2f8a3e210 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 20:08:41 +0600 Subject: [PATCH 13/35] DMOAB_DIR --- .github/workflows/windows_build_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index bd32d78d8..0cbe1f9cb 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -105,6 +105,7 @@ jobs: -DBUILD_MAKE_WATERTIGHT=ON \ -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ + -DMOAB_DIR=../install_dir \ -DCMAKE_PREFIX_PATH="${CONDA_LOC}" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ From 430bd6247f2a94fa00ab30c939ab66c83ebcc055 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 20:27:48 +0600 Subject: [PATCH 14/35] temporary fix --- .github/workflows/windows_build_test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 0cbe1f9cb..0271a9ec3 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5=1.10.6 + conda install -c conda-forge hdf5 - name: Environment Variables shell: bash -l {0} @@ -106,7 +106,8 @@ jobs: -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ -DMOAB_DIR=../install_dir \ - -DCMAKE_PREFIX_PATH="${CONDA_LOC}" \ + -DHDF5_ROOT="${CONDA_LOC}" \ + -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_MODULE_LINKER_FLAGS="" \ From 8a139e737d08f1f1ae4ceccd1f1bc8e05284dfa1 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 20:37:50 +0600 Subject: [PATCH 15/35] hdf5=1.10.6 --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 0271a9ec3..948cd7d11 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5 + conda install -c conda-forge hdf5=1.10.6 - name: Environment Variables shell: bash -l {0} From c753c43fc5160a1e087633ba59f76ec3911115fb Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 20:53:29 +0600 Subject: [PATCH 16/35] set(HDF5_LIBRARIES) --- .github/workflows/windows_build_test.yml | 11 ++++++++--- cmake/FindMOAB.cmake | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 948cd7d11..9dc8b4d19 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5=1.10.6 + conda install -c conda-forge hdf5 - name: Environment Variables shell: bash -l {0} @@ -77,9 +77,14 @@ jobs: -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DEIGEN3_DIR="${CONDA_LOC}/include/eigen3" \ -DHDF5_ROOT="${CONDA_LOC}" \ - -DHDF5_LIBRARIES="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ + -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ + -DCMAKE_EXE_LINKER_FLAGS="/std:c++latest -DH5_BUILT_AS_DYNAMIC_LIB" \ + -DCMAKE_MODULE_LINKER_FLAGS="/std:c++latest" \ + -DCMAKE_SHARED_LINKER_FLAGS="/std:c++latest" \ -DCMAKE_STATIC_LINKER_FLAGS="" \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" \ + -DCMAKE_CXX_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" cmake --build . --config Release cmake --install . --config Release diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake index ebf06fb66..92602c891 100644 --- a/cmake/FindMOAB.cmake +++ b/cmake/FindMOAB.cmake @@ -33,6 +33,7 @@ endif () if (NOT BUILD_SHARED_LIBS) set(HDF5_LIBRARIES_SHARED) endif () +set(HDF5_LIBRARIES) message(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}") message(STATUS "HDF5_LIBRARIES_SHARED: ${HDF5_LIBRARIES_SHARED}") From 730031662b38c9140a96c087ff620326bdeeea3c Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 20:55:01 +0600 Subject: [PATCH 17/35] hdf5=1.10.6 --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 9dc8b4d19..136f60dbe 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -49,7 +49,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5 + conda install -c conda-forge hdf5=1.10.6 - name: Environment Variables shell: bash -l {0} From 2afdf70a1fcb09041d18740e641bab57b703e4bd Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 21:28:41 +0600 Subject: [PATCH 18/35] conda remove -y yaml-cpp --- .github/workflows/windows_build_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 136f60dbe..442a931ae 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -50,6 +50,7 @@ jobs: run: | conda install curl eigen conda install -c conda-forge hdf5=1.10.6 + conda remove -y yaml-cpp - name: Environment Variables shell: bash -l {0} From 5976d18956d110cc8bcf53b1da62d1491d1c179f Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Mon, 2 Dec 2024 21:56:25 +0600 Subject: [PATCH 19/35] auto-activate-base: false --- .github/workflows/windows_build_test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 442a931ae..b4bb54da7 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -41,7 +41,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: - auto-activate-base: true + auto-activate-base: false activate-environment: "" # yaml-cpp package has conflicting gtest headers and is not needed for this project @@ -50,7 +50,6 @@ jobs: run: | conda install curl eigen conda install -c conda-forge hdf5=1.10.6 - conda remove -y yaml-cpp - name: Environment Variables shell: bash -l {0} From b905a5d8cb8f6feb568474e2fc3cfaefa5361618 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Wed, 4 Dec 2024 10:41:47 -0600 Subject: [PATCH 20/35] udpate conda and don't pin hdf5 --- .github/workflows/windows_build_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index b4bb54da7..2cb50333f 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -41,6 +41,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: + auto-update-conda: true auto-activate-base: false activate-environment: "" @@ -49,7 +50,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5=1.10.6 + conda install -c conda-forge hdf5 - name: Environment Variables shell: bash -l {0} From c86f7776c4d56514820223c0eda93d5a0d02cfcb Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Wed, 4 Dec 2024 11:05:27 -0600 Subject: [PATCH 21/35] try building MOAB with master branch --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 2cb50333f..76cfa38f0 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -64,7 +64,7 @@ jobs: shell: bash -l {0} run: | cd ${HOME_PATH} - git clone --depth 1 https://bitbucket.org/fathomteam/moab -b 5.5.1 + git clone --depth 1 https://bitbucket.org/fathomteam/moab -b master mkdir moab_build cd moab_build cmake ../moab \ From 609852b2984bcc5d21c60d2a2678716602f428c2 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Wed, 4 Dec 2024 11:24:16 -0600 Subject: [PATCH 22/35] switch back to 5.5.1 since master didn't fix linking issue --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 76cfa38f0..2cb50333f 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -64,7 +64,7 @@ jobs: shell: bash -l {0} run: | cd ${HOME_PATH} - git clone --depth 1 https://bitbucket.org/fathomteam/moab -b master + git clone --depth 1 https://bitbucket.org/fathomteam/moab -b 5.5.1 mkdir moab_build cd moab_build cmake ../moab \ From 11a79d7dc692151d10e87fc91a2718bf355300d7 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Wed, 4 Dec 2024 13:08:25 -0600 Subject: [PATCH 23/35] update CMake version requirement --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26d3263d1..1b420c13e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(DAGMC) -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.18) enable_language(CXX) # Set DAGMC version From 67f7ad877616072f0f46a2979821b55510436ce3 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 08:22:20 -0600 Subject: [PATCH 24/35] add HDF5 dynamic preproc flag for windows --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b420c13e..3959566dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(DAGMC_VERSION ${DAGMC_MAJOR_VERSION}.${DAGMC_MINOR_VERSION}.${DAGMC_PATCH_VE if(MSVC) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + add_definitions( -DH5_BUILT_AS_DYNAMIC_LIB ) endif() From 87bc7561205f1dcd9c7b736770a46dc9f96bd5b5 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 08:35:17 -0600 Subject: [PATCH 25/35] fix HDF5 1.12.2 --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 2cb50333f..2d238bea8 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -50,7 +50,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5 + conda install -c conda-forge hdf5==1.12.2 - name: Environment Variables shell: bash -l {0} From 08174ab03100dad198bd4341f546f634e01cd2fc Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 08:42:13 -0600 Subject: [PATCH 26/35] fix HDF5 1.10.6 --- .github/workflows/windows_build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 2d238bea8..94ee9e6c7 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -50,7 +50,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5==1.12.2 + conda install -c conda-forge hdf5==1.10.6 - name: Environment Variables shell: bash -l {0} From 863658972eec97ab50f4abd3598df78022a0b99e Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 08:54:12 -0600 Subject: [PATCH 27/35] mirror HDF5 Cmake config from MOAB to DAGMC --- .github/workflows/windows_build_test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 94ee9e6c7..fd937abb2 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -114,11 +114,12 @@ jobs: -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ - -DCMAKE_INSTALL_PREFIX=../install_dir/ \ - -DCMAKE_EXE_LINKER_FLAGS="" \ - -DCMAKE_MODULE_LINKER_FLAGS="" \ - -DCMAKE_SHARED_LINKER_FLAGS="" \ + -DCMAKE_EXE_LINKER_FLAGS="/std:c++latest -DH5_BUILT_AS_DYNAMIC_LIB" \ + -DCMAKE_MODULE_LINKER_FLAGS="/std:c++latest" \ + -DCMAKE_SHARED_LINKER_FLAGS="/std:c++latest" \ -DCMAKE_STATIC_LINKER_FLAGS="" \ + -DCMAKE_EXE_LINKER_FLAGS="" \ + -DCMAKE_INSTALL_PREFIX=../install_dir/ \ -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release cmake --install . --config Release From ea38ef775fdd8d754f4c2e7d060e586534db1a61 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 08:54:30 -0600 Subject: [PATCH 28/35] correct Changelog --- doc/CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index c7ce6639f..273a1dc42 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -13,7 +13,7 @@ v3.2.4 **Changed:** * Adding info messages to CMake output for double down (#962) - * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933 #9??) + * Update hdf5 to v1.14.3 from v1.10.4 for linux builds (#931 #933) * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935) * Update MOAB to 5.5.1 from 5.3.0 (#939 #940) * Update README regarding OpenMC (#938) From 4ac8d727bbdf069c4a8577431b31c10e51c3bea1 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 09:02:16 -0600 Subject: [PATCH 29/35] mirror compiler Cmake config from MOAB to DAGMC --- .github/workflows/windows_build_test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index fd937abb2..7b2ebb4aa 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -111,6 +111,7 @@ jobs: -DBUILD_MAKE_WATERTIGHT=ON \ -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ + -G"Visual Studio 16 2019" \ -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ @@ -120,7 +121,9 @@ jobs: -DCMAKE_STATIC_LINKER_FLAGS="" \ -DCMAKE_EXE_LINKER_FLAGS="" \ -DCMAKE_INSTALL_PREFIX=../install_dir/ \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" \ + -DCMAKE_CXX_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" cmake --build . --config Release cmake --install . --config Release From 9d1377af39a4f1541145a0e7d6d5dd6a0efe69aa Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 09:14:27 -0600 Subject: [PATCH 30/35] remove extra generator spec --- .github/workflows/windows_build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 7b2ebb4aa..05f69f1d6 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -111,7 +111,6 @@ jobs: -DBUILD_MAKE_WATERTIGHT=ON \ -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ - -G"Visual Studio 16 2019" \ -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ From bb085df4f60b861c275856c791756d856696ead1 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 09:32:34 -0600 Subject: [PATCH 31/35] Pause Windows CI --- .github/workflows/windows_build_test.yml | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 05f69f1d6..ae6ff7061 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -3,33 +3,33 @@ name: Windows Build/Test on: # allows us to run workflows manually workflow_dispatch: - pull_request: - branches: - - develop - paths-ignore: - - '.github/workflows/docker_publish.yml' - - '.github/workflows/linux_build_test.yml' - - '.github/workflows/linux_upstream_test_*' - - '.github/workflows/mac_build_test.yml' - - '.github/workflows/housekeeping.yml' - - '.github/workflows/changelog_test.yml' - - '.github/actions/**' - - 'CI/**' - - 'doc/**' + # pull_request: + # branches: + # - develop + # paths-ignore: + # - '.github/workflows/docker_publish.yml' + # - '.github/workflows/linux_build_test.yml' + # - '.github/workflows/linux_upstream_test_*' + # - '.github/workflows/mac_build_test.yml' + # - '.github/workflows/housekeeping.yml' + # - '.github/workflows/changelog_test.yml' + # - '.github/actions/**' + # - 'CI/**' + # - 'doc/**' - push: - branches: - - develop - paths-ignore: - - '.github/workflows/docker_publish.yml' - - '.github/workflows/linux_build_test.yml' - - '.github/workflows/linux_upstream_test_*' - - '.github/workflows/mac_build_test.yml' - - '.github/workflows/housekeeping.yml' - - '.github/workflows/changelog_test.yml' - - '.github/actions/**' - - 'CI/**' - - 'doc/**' + # push: + # branches: + # - develop + # paths-ignore: + # - '.github/workflows/docker_publish.yml' + # - '.github/workflows/linux_build_test.yml' + # - '.github/workflows/linux_upstream_test_*' + # - '.github/workflows/mac_build_test.yml' + # - '.github/workflows/housekeeping.yml' + # - '.github/workflows/changelog_test.yml' + # - '.github/actions/**' + # - 'CI/**' + # - 'doc/**' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8aa22a4abc3c1bfe95f75ec18f658249e91eb1fb Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Thu, 12 Dec 2024 09:36:12 -0600 Subject: [PATCH 32/35] note change in windows CI support --- doc/CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 273a1dc42..572b4646d 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -24,6 +24,7 @@ v3.2.4 * Update github actions to newer versions as necessary (#958) * CMake error message update (#960) * Updated documentation to build dependencies (#963) + * Pause support for Windows (#966) v3.2.3 ==================== From e0404cc4aa4e735df074b221e165b637f3a5096d Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Tue, 3 Dec 2024 13:27:15 -0600 Subject: [PATCH 33/35] localize git submodule stuff to only when BUILD_UWUW --- CMakeLists.txt | 16 ---------------- src/CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3959566dd..cd6c24fcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,22 +30,6 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") endif() option(GIT_SUBMODULE "Check submodules during build" ON) - if(GIT_SUBMODULE) - message(STATUS "Submodule update") - execute_process(COMMAND ${GIT_EXECUTABLE} "submodule" "update" "--init" "--recursive" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - if(NOT GIT_SUBMOD_RESULT EQUAL 0) - message(FATAL_ERROR "git submodule update --init --recursive failed with \ - ${GIT_SUBMOD_RESULT}, please checkout submodules") - endif() - endif() -endif() - -# Check to see if submodules exist (by checking one) -if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/pyne/pyne/readme.rst") - message(FATAL_ERROR "The git submodules were not downloaded! GIT_SUBMODULE was \ - turned off or failed. Please update submodules and try again.") endif() # Make the scripts in the "cmake" directory available to CMake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11fe95e9d..239dc7a94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,6 +15,23 @@ if (BUILD_MCNP5 OR BUILD_MCNP6 OR BUILD_GEANT4 OR BUILD_FLUKA OR BUILD_CI_TESTS) endif () if (BUILD_UWUW) add_subdirectory(uwuw) + + if(GIT_SUBMODULE) + message(STATUS "Submodule update") + execute_process(COMMAND ${GIT_EXECUTABLE} "submodule" "update" "--init" "--recursive" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if(NOT GIT_SUBMOD_RESULT EQUAL 0) + message(FATAL_ERROR "git submodule update --init --recursive failed with \ + ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif() + endif() + + # Check to see if submodules exist (by checking one) + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/pyne/pyne/readme.rst") + message(FATAL_ERROR "The git submodules were not downloaded! GIT_SUBMODULE was \ + turned off or failed. Please update submodules and try again.") + endif() add_subdirectory(pyne) endif () From 1db2d07bf3e9586172d4c170dd7640046c7223d9 Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Tue, 3 Dec 2024 13:36:59 -0600 Subject: [PATCH 34/35] update changelog --- doc/CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 572b4646d..71e4daae4 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -25,6 +25,7 @@ v3.2.4 * CMake error message update (#960) * Updated documentation to build dependencies (#963) * Pause support for Windows (#966) + * Localize invocation of git submodule for PyNE (#968) v3.2.3 ==================== From 08b56c5bcd70b716d0bda179f58abc9b97f8de6c Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Tue, 3 Dec 2024 13:40:05 -0600 Subject: [PATCH 35/35] fix path checked for submodule --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 239dc7a94..e9a2df084 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,7 +28,7 @@ if (BUILD_UWUW) endif() # Check to see if submodules exist (by checking one) - if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/pyne/pyne/readme.rst") + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pyne/pyne/readme.rst") message(FATAL_ERROR "The git submodules were not downloaded! GIT_SUBMODULE was \ turned off or failed. Please update submodules and try again.") endif()