Updating github workflows with new define constant and ubuntu python.

awsteiner · Jul 19, 2024 · 2f01303 · 2f01303
1 parent d36317c
commit 2f01303
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/opensuse_TW-i386-min.yml b/.github/workflows/opensuse_TW-i386-min.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         export CC='ccache gcc'
         export CXX='ccache g++'
-        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_FAST_TEST"
+        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_OPENSUSE"
         export LDFLAGS+="-lgomp"
         export CCACHE_DIR=~/.ccache
         ./configure --build=i386-suse-linux --enable-shared --disable-static --enable-armadillo --enable-eigen --enable-fftw --enable-openmp --enable-ncurses --disable-pugixml --disable-python
@@ -44,4 +44,5 @@ jobs:
         make VERBOSE=1 -C data install-data
 
     - name: make check
-      run: make VERBOSE=1 o2scl-test -j4 -O
+      #run: make VERBOSE=1 o2scl-test -j4 -O
+      run: make VERBOSE=1 o2scl-test -O
diff --git a/.github/workflows/opensuse_TW-x86_64-min.yml b/.github/workflows/opensuse_TW-x86_64-min.yml
@@ -39,7 +39,7 @@ jobs:
       run: |
         export CC='ccache gcc'
         export CXX='ccache g++'
-        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_FAST_TEST"
+        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_OPENSUSE"
         export LDFLAGS+="-lgomp"
         export CCACHE_DIR=~/.ccache
         ./configure --build=x86_64-suse-linux --enable-shared --disable-static --enable-armadillo --enable-eigen --enable-fftw --enable-openmp --enable-ncurses --disable-pugixml --disable-python

diff --git a/.github/workflows/opensuse_TW-x86_64-plus.yml b/.github/workflows/opensuse_TW-x86_64-plus.yml
@@ -39,7 +39,7 @@ jobs:
       run: |
         export CC='ccache gcc'
         export CXX='ccache g++'
-        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_FAST_TEST"
+        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_OPENSUSE"
         export LDFLAGS+="-lgomp"
         export CCACHE_DIR=~/.ccache
         ./configure --build=x86_64-suse-linux --enable-shared --disable-static --enable-armadillo --enable-eigen --enable-fftw --enable-openmp --enable-ncurses 

diff --git a/.github/workflows/ubuntu-x86_64-py.yml b/.github/workflows/ubuntu-x86_64-py.yml
@@ -28,11 +28,21 @@ jobs:
           cache-ubuntu-x86_64-py
         save-always: true
 
-    - name: Install and cache apt packages
-      run: sudo apt-get -y update && sudo apt-get -y install ccache curl g++ gzip libarmadillo-dev libarpack2-dev libboost-all-dev libeigen3-dev libfftw3-dev libgsl-dev libhdf5-dev liblapack-dev libopenblas-dev libreadline-dev make tar cmake python3 libz-dev libsz2 imagemagick texlive dvipng texlive-latex-extra cm-super python3-pip libcairo2-dev libquadmath0 zlib1g-dev python3-h5py
+    # I'm having trouble with numpy, apparently libboost-all-dev installs
+    # it's own version and then we can't find the numpy headers, we install
+    # it first, then the rest of the apt packages
+    - name: Install apt packages
+      run: sudo apt-get -y update && sudo apt-get -y install ccache curl g++ gzip python3 python3-pip
 
     - name: Install python packages
-      run:
+      run: |
+        pip install  --break-system-packages numpy==1.26.4 h5py
+
+    - name: Install apt packages 2
+      run: sudo apt-get -y install libarmadillo-dev libarpack2-dev libboost-all-dev libeigen3-dev libfftw3-dev libgsl-dev libhdf5-dev liblapack-dev libopenblas-dev libreadline-dev make tar cmake libz-dev libsz2 imagemagick texlive dvipng texlive-latex-extra cm-super libcairo2-dev libquadmath0 zlib1g-dev
+
+    - name: Install python packages 2
+      run: |
         pip install  --break-system-packages -r docker/u24.04_req.txt
 
     - name: Set up autotools scripts

diff --git a/src/eos/eos_had_skyrme_ts.cpp b/src/eos/eos_had_skyrme_ts.cpp
@@ -70,8 +70,6 @@ int main(void) {
   test_mgr t;
   t.set_output_level(2);
 
-#ifdef O2SCL_FAST_TEST
-
   double n0, eoa2;
   eos_had_skyrme sk;
 
@@ -551,8 +549,6 @@ int main(void) {
   t.test_rel(tnfd.dmudn_mixed,(dmupdnn2-dmupdnn1)/eps,
 	     1.0e-4,"second deriv, dmupdnn");
 
-#endif
-
   t.report();
 
   return 0;