Skip to content

Updates for building with NCrystal support (and fix CI) #3274

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

Merged
paulromano merged 6 commits into from
Feb 11, 2025
Merged

Updates for building with NCrystal support (and fix CI) #3274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d98e46
Remove spurious NCrystal include which will be removed in NCrystal 4.0.0
tkittel Jan 23, 2025
8f3e86b
Make sure find_package(NCrystal) also works with pip installed NCrystal
tkittel Jan 23, 2025
571dce8
Also make OpenMCConfig.cmake work with NCrystal from pip wheels
tkittel Feb 11, 2025
bf3818b
Try to appease clang-format
tkittel Feb 3, 2025
c4657fb
Replace manual git clone and cmake build of NCrystal with pip install
tkittel Feb 10, 2025
14688c9
Update ncrystal/results_true.dat for NCrystal 4.0.0
tkittel Feb 11, 2025
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
Prev Previous commit
Next Next commit
Replace manual git clone and cmake build of NCrystal with pip install
  • Loading branch information
@tkittel
tkittel committed Feb 11, 2025
commit c4657fbb64317ac8a576644c254a2dbc968533d9
46 changes: 0 additions & 46 deletions tools/ci/gha-install-ncrystal.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tools/ci/gha-install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, ncrys

if ncrystal:
cmake_cmd.append('-DOPENMC_USE_NCRYSTAL=ON')
ncrystal_path = os.environ.get('HOME') + '/ncrystal_inst'
cmake_cmd.append(f'-DCMAKE_PREFIX_PATH={ncrystal_path}')

# Build in coverage mode for coverage testing
cmake_cmd.append('-DOPENMC_ENABLE_COVERAGE=on')
Expand Down
4 changes: 3 additions & 1 deletion tools/ci/gha-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ fi

# Install NCrystal if needed
if [[ $NCRYSTAL = 'y' ]]; then
./tools/ci/gha-install-ncrystal.sh
pip install ncrystal
#Basic verification:
nctool --test
fi

# Install vectfit for WMP generation if needed
Expand Down
2 changes: 0 additions & 2 deletions tools/ci/gha-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ fi

# Check NCrystal installation
if [[ $NCRYSTAL = 'y' ]]; then
# Change environmental variables
eval $( "${HOME}/ncrystal_inst/bin/ncrystal-config" --setup )
nctool --test
fi

Expand Down