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..eba5c85cc 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 @@ -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 936072b14..251234860 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 \ @@ -169,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 \ @@ -180,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 && \ 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 ====================