Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove eigen3 #941

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mac_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions CI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ RUN apt-get -y update; \
gfortran \
libhdf5-dev \
libtool \
libeigen3-dev\
python3-numpy \
python3 \
python3-pip \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 && \
Expand Down
4 changes: 4 additions & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================

Expand Down
Loading