From 14d891415f752fb1fe7e1c6b4cc5113ce5d60245 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 22 Feb 2024 21:29:51 +0600 Subject: [PATCH 1/6] update to 5.5.1 --- .github/actions/upstream-test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml index 7cbf61ee1..8aa874092 100644 --- a/.github/actions/upstream-test/action.yml +++ b/.github/actions/upstream-test/action.yml @@ -24,7 +24,7 @@ inputs: moab_version: description: Version of MOAB required: false - default: 5.3.0 + default: 5.5.1 double_down_version: description: Version of Double Down required: false From b7a6931f2a59752f5f8b80003cae10a1e737ad47 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 22 Feb 2024 21:30:10 +0600 Subject: [PATCH 2/6] remove off --- .github/workflows/docker_publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 0337034b5..647f86800 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -34,7 +34,6 @@ jobs: 11.1.2 ] double_down_version : [ - off, v1.1.0, ] @@ -115,7 +114,6 @@ jobs: 11.1.2 ] double_down_version : [ - off, v1.1.0, ] From 241b8d4d23fb58a9bc9849752687b0e3539476df Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 22 Feb 2024 22:10:59 +0600 Subject: [PATCH 3/6] dd_VERSION --- cmake/DAGMC_macros.cmake | 2 +- cmake/FindDOUBLE_DOWN.cmake | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmake/DAGMC_macros.cmake b/cmake/DAGMC_macros.cmake index 9b8b5b9db..9fd0893e5 100644 --- a/cmake/DAGMC_macros.cmake +++ b/cmake/DAGMC_macros.cmake @@ -90,7 +90,7 @@ macro (dagmc_setup_options) if (DOUBLE_DOWN) find_package(DOUBLE_DOWN REQUIRED) - if (DOUBLE_DOWN_VERSION VERSION_LESS 1.1.0) + if (dd_VERSION VERSION_LESS 1.1.0) message(FATAL_ERROR "Discovered Double Down Version: ${DOUBLE_DOWN_VERSION}. \ Please update Double Down to version 1.1.0 or greater.") endif() diff --git a/cmake/FindDOUBLE_DOWN.cmake b/cmake/FindDOUBLE_DOWN.cmake index d3eaafcab..2d4ec2d4d 100644 --- a/cmake/FindDOUBLE_DOWN.cmake +++ b/cmake/FindDOUBLE_DOWN.cmake @@ -6,6 +6,7 @@ # dd_INCLUDE_DIRS - include directories for installed dd headers # dd_LIBRARY_DIRS - location of installed dd libraries # dd_LIBRARIES - set of libraries installed with dd, use to link applications against dd +# dd_VERSION - version of installed dd find_path(dd_CMAKE_CONFIG NAMES ddConfig.cmake HINTS ${dd_ROOT} $ENV{dd_ROOT} @@ -14,6 +15,12 @@ find_path(dd_CMAKE_CONFIG NAMES ddConfig.cmake PATH_SUFFIXES lib Lib cmake lib/cmake/ lib/cmake/dd NO_DEFAULT_PATH) -message(STATUS "Found dd in ${dd_CMAKE_CONFIG}") - -include(${dd_CMAKE_CONFIG}/ddConfig.cmake) +if (dd_CMAKE_CONFIG) + message(STATUS "Found dd in ${dd_CMAKE_CONFIG}") + include(${dd_CMAKE_CONFIG}/ddConfig.cmake) + include(${dd_CMAKE_CONFIG}/ddConfigVersion.cmake) + set(dd_VERSION ${PACKAGE_VERSION}) + message(STATUS "Found dd version ${dd_VERSION}") +else() + message(FATAL_ERROR "Could not find dd") +endif() From 0c6d98a829c33336ab32690ae05b36244ba51c5e Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 22 Feb 2024 22:13:16 +0600 Subject: [PATCH 4/6] Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944) --- doc/CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 91a98c3de..ffea060d0 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -14,7 +14,7 @@ Next version * Update MOAB to 5.5.1 from 5.3.0 (#939 #940) * Update README regarding OpenMC (#938) * Simplify Housekeeping Process for DAGMC (#943) - * Allow Double Down v1.1.0 Installation in Dockerfile (#929) + * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944) v3.2.3 ==================== From 5f533ad7a34d6b2a909634e35af7cad8579b974a Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 22 Feb 2024 22:29:51 +0600 Subject: [PATCH 5/6] add off --- .github/workflows/docker_publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 647f86800..64b2b6313 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -30,10 +30,12 @@ jobs: 5.5.1, ] geant4_version : [ + off, 10.7.4, 11.1.2 ] double_down_version : [ + off, v1.1.0, ] @@ -110,10 +112,12 @@ jobs: 5.5.1, ] geant4_version : [ + off, 10.7.4, 11.1.2 ] double_down_version : [ + off, v1.1.0, ] From a27ba7318830940842c7179fe30c3c2bb7705571 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Tue, 27 Feb 2024 09:39:19 +0600 Subject: [PATCH 6/6] remove libhdf5-dev --- CI/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/CI/Dockerfile b/CI/Dockerfile index 93e6a5219..2d19dd9e6 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -39,7 +39,6 @@ RUN apt-get update --yes && \ g++ \ gcc \ gfortran \ - libhdf5-dev \ libtool \ libeigen3-dev\ python3 \