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.

Sign up for GitHub

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

Merge v3.2.4 release candidate for final release #966

Open
wants to merge 36 commits into
base: develop
Choose a base branch
from
Open

Merge v3.2.4 release candidate for final release #966

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7a85d43
Advance version titles in CHANGELOG
gonuke Oct 5, 2024
43811cb
Advance version number in CMakeLists.txt
gonuke Oct 5, 2024
a6c4cba
unpin HDF5 for Windows
gonuke Nov 22, 2024
cc00907
don't remove yaml-cpp
gonuke Nov 22, 2024
d6791fc
force brew install overwrite
gonuke Nov 22, 2024
787b842
force instead of overwrite in brew
gonuke Nov 22, 2024
1d315f9
remove force
ahnaf-tahmid-chowdhury Dec 2, 2024
91c7f59
set hdf5 to 1.10.6
ahnaf-tahmid-chowdhury Dec 2, 2024
0acb3b9
Use DAGMC's FindMOAB
ahnaf-tahmid-chowdhury Dec 2, 2024
eaaab09
remove set(HDF5_LIBRARIES)
ahnaf-tahmid-chowdhury Dec 2, 2024
c1d6ebf
DHDF5_DIR
ahnaf-tahmid-chowdhury Dec 2, 2024
f78744a
DCMAKE_PREFIX_PATH
ahnaf-tahmid-chowdhury Dec 2, 2024
603d67a
DMOAB_DIR
ahnaf-tahmid-chowdhury Dec 2, 2024
430bd62
temporary fix
ahnaf-tahmid-chowdhury Dec 2, 2024
8a139e7
hdf5=1.10.6
ahnaf-tahmid-chowdhury Dec 2, 2024
c753c43
set(HDF5_LIBRARIES)
ahnaf-tahmid-chowdhury Dec 2, 2024
7300316
hdf5=1.10.6
ahnaf-tahmid-chowdhury Dec 2, 2024
2afdf70
conda remove -y yaml-cpp
ahnaf-tahmid-chowdhury Dec 2, 2024
5976d18
auto-activate-base: false
ahnaf-tahmid-chowdhury Dec 2, 2024
b905a5d
udpate conda and don't pin hdf5
gonuke Dec 4, 2024
c86f777
try building MOAB with master branch
gonuke Dec 4, 2024
609852b
switch back to 5.5.1 since master didn't fix linking issue
gonuke Dec 4, 2024
11a79d7
update CMake version requirement
gonuke Dec 4, 2024
67f7ad8
add HDF5 dynamic preproc flag for windows
gonuke Dec 12, 2024
87bc756
fix HDF5 1.12.2
gonuke Dec 12, 2024
08174ab
fix HDF5 1.10.6
gonuke Dec 12, 2024
8636589
mirror HDF5 Cmake config from MOAB to DAGMC
gonuke Dec 12, 2024
ea38ef7
correct Changelog
gonuke Dec 12, 2024
4ac8d72
mirror compiler Cmake config from MOAB to DAGMC
gonuke Dec 12, 2024
9d1377a
remove extra generator spec
gonuke Dec 12, 2024
bb085df
Pause Windows CI
gonuke Dec 12, 2024
8aa22a4
note change in windows CI support
gonuke Dec 12, 2024
e0404cc
localize git submodule stuff to only when BUILD_UWUW
gonuke Dec 3, 2024
1db2d07
update changelog
gonuke Dec 3, 2024
08b56c5
fix path checked for submodule
gonuke Dec 3, 2024
f4ae921
Merge pull request #968 from gonuke/mv_submodule
pshriwise Dec 12, 2024
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
View file
Open in desktop
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 --force eigen hdf5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the new HDF5 comes with a new pkgconf, which is causing the linking issue.

We could consider running:

brew link --overwrite pkgconf
or
brew reinstall pkg-config

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know enough about brew to know in which order this would come relative to the lines we already have?


- name: Environment Variables
shell: bash -l {0}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/windows_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ jobs:
shell: bash -l {0}
run: |
conda install curl eigen
conda install -c conda-forge hdf5=1.10.6
conda remove -y yaml-cpp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we still consider this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change makes sense - it fixes one problem, but there is now a new linking problem on Windows because we don't find the HDF5 library at link time. I haven't had time to figure out why.

conda install -c conda-forge hdf5

- name: Environment Variables
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ DAGMC Changelog
Next version
====================

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)
Expand Down
Loading