From 6e93fac9ad1483aace8eec1e322b8b3c060701b2 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 15 Feb 2024 12:23:55 +0600 Subject: [PATCH 1/4] remove eigen3 --- .github/workflows/mac_build_test.yml | 2 +- .github/workflows/windows_build_test.yml | 2 +- CI/Dockerfile | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 354dc42f1..205b3ad46 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 hdf5 - name: Environment Variables shell: bash -l {0} diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 004664742..59d5e3ffe 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -48,7 +48,7 @@ jobs: - name: Conda dependencies shell: bash -l {0} run: | - conda install curl eigen + conda install curl conda install -c conda-forge hdf5=1.10.6 conda remove -y yaml-cpp diff --git a/CI/Dockerfile b/CI/Dockerfile index 936072b14..66a313997 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -36,7 +36,6 @@ RUN apt-get -y update; \ gfortran \ libhdf5-dev \ libtool \ - libeigen3-dev\ python3-numpy \ python3 \ python3-pip \ From 2cddb0a800b08a771b93f1b4e2254d2489935714 Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 15 Feb 2024 12:30:12 +0600 Subject: [PATCH 2/4] Remove Eigen3 dependency from DAGMC --- doc/CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 02e51f13d..345a19a0e 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -13,6 +13,10 @@ Next version * 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) +**Removed:** + + * Remove Eigen3 dependency from DAGMC (#941) + v3.2.3 ==================== From 85e4f3dda24cdfc9f7f47995e57d12b17cb41f7b Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 15 Feb 2024 14:52:21 +0600 Subject: [PATCH 3/4] DENABLE_BLASLAPACK = OFF --- .github/workflows/windows_build_test.yml | 1 + CI/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 59d5e3ffe..eba5c85cc 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -108,6 +108,7 @@ jobs: -DBUILD_MAKE_WATERTIGHT=ON \ -DBUILD_OVERLAP_CHECK=OFF \ -DBUILD_TESTS=ON \ + -DENABLE_BLASLAPACK=OFF \ -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" \ diff --git a/CI/Dockerfile b/CI/Dockerfile index 66a313997..a3f072ca4 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -179,6 +179,7 @@ RUN mkdir -p ${moab_build_dir}/build && \ -DENABLE_BLASLAPACK=OFF \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_FORTRAN=OFF \ + -DENABLE_BLASLAPACK=OFF \ -DENABLE_PYMOAB=ON && \ make -j${ci_jobs} && \ make install && \ From 04239b553dd2da0447020819768ee4d2eb8417dc Mon Sep 17 00:00:00 2001 From: Ahnaf Tahmid Chowdhury Date: Thu, 15 Feb 2024 15:27:33 +0600 Subject: [PATCH 4/4] try with my fork --- CI/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/Dockerfile b/CI/Dockerfile index a3f072ca4..251234860 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -168,7 +168,7 @@ ENV moab_install_dir=${install_dir}/moab RUN mkdir -p ${moab_build_dir}/build && \ cd ${moab_build_dir} && \ - git clone -b ${MOAB_BRANCH} --depth 1 https://bitbucket.org/fathomteam/moab && \ + git clone -b disable-blaslapack https://ahnaf-tahmid@bitbucket.org/ahnaf-tahmid-chowdhury/moab.git && \ cd build && \ cmake ../moab -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}/lib:${moab_install_dir}/lib \ -DCMAKE_BUILD_TYPE=Release \