Merge pull request #36 from openmsr/add_Arch_to_test

Also add an arch test
openmsr · Sep 9, 2024 · 5649eb1 · 5649eb1
2 parents b86e77e + 6e446d0
commit 5649eb1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/.github/workflows/build_from_source_containers.yml b/.github/workflows/build_from_source_containers.yml
@@ -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' }
@@ -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" }
@@ -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:

diff --git a/Arch/dagmc-install.sh b/Arch/dagmc-install.sh
@@ -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
@@ -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
@@ -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 \

diff --git a/Arch/double_down-install.sh b/Arch/double_down-install.sh
@@ -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
@@ -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

diff --git a/Arch/moab-install.sh b/Arch/moab-install.sh
@@ -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
@@ -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

diff --git a/Arch/openmc-install.sh b/Arch/openmc-install.sh
@@ -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
@@ -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
@@ -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