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

Also add an arch test #36

Merged
merged 9 commits into from
Sep 9, 2024
Merged

Also add an arch test #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9bde0bf
add an arch test
ebknudsen Sep 9, 2024
c2262e1
also need sudo
ebknudsen Sep 9, 2024
0782cd6
use HOME as default build location
ebknudsen Sep 9, 2024
791f022
need make as well
ebknudsen Sep 9, 2024
4c43249
more deps needed
ebknudsen Sep 9, 2024
36b3213
for debuggin fail fast
ebknudsen Sep 9, 2024
10ebfdb
prefer CPU to Processor
ebknudsen Sep 9, 2024
9269e73
also need pip
ebknudsen Sep 9, 2024
6e446d0
dagmc no longer needs to be patched
ebknudsen Sep 9, 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
7 changes: 6 additions & 1 deletion .github/workflows/build_from_source_containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
run-build-stack:
strategy:
fail-fast: false
fail-fast: true
matrix:
include:
- { os: Debian11, container: "debian:11", CC: gcc-10, CXX: g++-10, python: '3.10' }
Expand All @@ -22,6 +22,7 @@ jobs:
- { os: Debian12, container: "debian:12", CC: gcc-12, CXX: g++-12, python: '3.12' }
- { os: Debian12, container: "debian:12", CC: gcc-12, CXX: g++-12, python: '3.11' }
- { os: Debian12, container: "debian:12", CC: gcc-12, CXX: g++-12, python: '3.10' }
- { os: Arch, container: "archlinux:latest", CC: gcc, CXX: g++, python: '3' }
# - { os: macos-11, CC: clang, CXX: clang++, python: "3.10" }
# - { os: macos-12, CC: clang, CXX: clang++, python: "3.11" }
# - { os: macos-13, CC: clang, CXX: clang++, python: "3.11" }
Expand All @@ -39,6 +40,10 @@ jobs:
apt-get dist-upgrade
apt-get install git build-essential sudo
if: ${{ matrix.os == 'Debian11' || matrix.os == 'Debian12' }}
- name: bootstrap arch
run: |
pacman -Syu --noconfirm gcc python>${{ matrix.python }} cmake git sudo make python-numpy python-pip cython
if: ${{ matrix.os == 'Arch' }}
- name: checkout_main_repo
uses: actions/checkout@v3
with:
Expand Down
10 changes: 2 additions & 8 deletions Arch/dagmc-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ install_prefix="/usr/local/lib"
if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then
install_prefix=$LOCAL_INSTALL_PREFIX
fi

build_prefix="/dev/null/openmc" #this will never exist - and so use the default later.
build_prefix="$HOME"
if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then
build_prefix=$OPENMC_BUILD_PREFIX
fi
Expand All @@ -34,7 +33,7 @@ if [ ! -e ${name}.done ]; then
fi

#Should we run make in parallel? Default is to use all available cores
ccores=`cat /proc/cpuinfo |grep CPU|wc -l`
ccores=`cat /proc/cpuinfo |grep Processor|wc -l`
if [ "x$1" != "x" ]; then
ccores=$1
fi
Expand All @@ -47,11 +46,6 @@ if [ ! -e ${name}.done ]; then
cd DAGMC; git pull; cd ..
fi

for patch in `ls ${WD}/../patches/dagmc_*.patch`; do
patch -p1 < $patch
done

cd ..
mkdir -p build
cd build
cmake ../DAGMC -DBUILD_TALLY=ON \
Expand Down
8 changes: 3 additions & 5 deletions Arch/double_down-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ WD=`pwd`
name=`basename $0`
package_name='double_down'

install_prefix="/opt"
install_prefix="/usr/local/lib"
if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then
install_prefix=$LOCAL_INSTALL_PREFIX
fi
build_prefix="$HOME/openmc"

build_prefix="/dev/null/openmc" #this will never exist - and so use the default later.
build_prefix="$HOME"
if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then
build_prefix=$OPENMC_BUILD_PREFIX
fi
Expand All @@ -36,7 +34,7 @@ if [ ! -e ${name}.done ]; then
sudo pacman -Sy --noconfirm embree doxygen

#Should we run make in parallel? Default is to use all available cores
ccores=`cat /proc/cpuinfo |grep CPU|wc -l`
ccores=`cat /proc/cpuinfo |grep Processor|wc -l`
if [ "x$1" != "x" ]; then
ccores=$1
fi
Expand Down
6 changes: 3 additions & 3 deletions Arch/moab-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ WD=`pwd`
name=`basename $0`
package_name='MOAB'

install_prefix="/opt"
install_prefix="/usr/local/lib"
if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then
install_prefix=$LOCAL_INSTALL_PREFIX
fi

build_prefix="/dev/null/openmc" #this will never exist - and so use the default later.
build_prefix="$HOME"
if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then
build_prefix=$OPENMC_BUILD_PREFIX
fi
Expand All @@ -33,7 +33,7 @@ if [ ! -e ${name}.done ]; then
cython
fi
#Should we run make in parallel? Default is to use all available cores
ccores=`cat /proc/cpuinfo |grep CPU|wc -l`
ccores=`cat /proc/cpuinfo |grep Processor|wc -l`
if [ "x$1" != "x" ]; then
ccores=$1
fi
Expand Down
6 changes: 3 additions & 3 deletions Arch/openmc-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -ex
#./nuclear_data-install.sh
#echo "Downloaded & extracted nuclear data, proceeding..."

openmc_version="v0.14.0"
openmc_version="v0.15.0"
if [ "x" != "x$OPENMC_VERSION" ]; then
openmc_version=$OPENMC_VERSION
fi
Expand All @@ -26,7 +26,7 @@ if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then
install_prefix=$LOCAL_INSTALL_PREFIX
fi

build_prefix="/dev/null/openmc" #this will never exist - and so use the default later.
build_prefix="$HOME"
if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then
build_prefix=$OPENMC_BUILD_PREFIX
fi
Expand Down Expand Up @@ -57,7 +57,7 @@ if [ ! -e ${name}.done ]; then
fi
fi
#Should we run make in parallel? Default is to use all available cores
ccores=`cat /proc/cpuinfo |grep CPU|wc -l`
ccores=`cat /proc/cpuinfo |grep Processor|wc -l`
if [ "x$1" != "x" ]; then
ccores=$1
fi
Expand Down
Loading