Work on py/i386.

awsteiner · Jul 21, 2024 · 5967cb5 · 5967cb5
1 parent afc5829
commit 5967cb5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 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_OPENSUSE"
+        export CXXFLAGS+="-DO2SCL_PLAIN_HDF5_HEADER -DO2SCL_OPENSUSE -DO2SCL_OPENSUSE_I386"
         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,5 +44,4 @@ 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 -O
+      run: make VERBOSE=1 o2scl-test -j4 -O
diff --git a/.github/workflows/ubuntu-x86_64-py.yml b/.github/workflows/ubuntu-x86_64-py.yml
@@ -28,28 +28,21 @@ jobs:
           cache-ubuntu-x86_64-py
         save-always: true
 
-    # 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. However, this could have
-    # been simply because I had the numpy include directory wrong, so it
-    # could be that this two-step process is unnecessary. 
     - name: Install apt packages
-      run: sudo apt-get -y update && sudo apt-get -y install ccache curl g++ gzip python3 python3-pip
+      run: sudo apt-get -y update && sudo apt-get -y install ccache curl g++ gzip python3 python3-pip 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
       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: Find numpy
-      run:
+      run: |
         find /usr -name numpy
+        find /usr -name arrayobject.h
+        ls /usr/include/boost/python/numpy
+        ls /usr/include/boost/python/numpy/core
+        ls /usr/include/boost/python/numpy/core/include
 
     - name: Set up autotools scripts
       run:
@@ -60,7 +53,7 @@ jobs:
         export CC='ccache gcc'
         export CXX='ccache g++'
         export CCACHE_DIR=~/.ccache
-        export CXXFLAGS+="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_HDF5_COMP -I/usr/include -I/usr/lib/python3.12/dist-packages/numpy/core/include"
+        export CXXFLAGS+="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_HDF5_COMP -I/usr/include -I/usr/include/boost/python/numpy/core/include"
         mkdir -p ${PWD}/build
         ./configure --build=x86_64-ubuntu-linux --prefix=${PWD}/build --enable-shared --disable-static --enable-armadillo --enable-eigen --enable-fftw --enable-openmp --enable-python
 

diff --git a/src/eos/eos_had_skyrme_ts.cpp b/src/eos/eos_had_skyrme_ts.cpp
@@ -70,7 +70,7 @@ int main(void) {
   test_mgr t;
   t.set_output_level(2);
 
-#ifndef O2SCL_OPENSUSE
+#ifndef O2SCL_OPENSUSE_I386
 
   double n0, eoa2;
   eos_had_skyrme sk;

diff --git a/src/hdf/hdf_file_ts.cpp b/src/hdf/hdf_file_ts.cpp
@@ -151,6 +151,7 @@ int main(void) {
       hf.get_szt("testu",u2);
       hf.getf("testf",f2);
 
+#ifndef O2SCL_OPENSUSE_I386
       hf.getfp_copy("d",dx);
       hf.getfp_copy("d35",d35);
       t.test_rel(dx,2.0,1.0e-12,"test fp 1");
@@ -161,6 +162,7 @@ int main(void) {
       t.test_rel(dxa[1],1.0,1.0e-12,"test fpa 2");
       t.test_rel(static_cast<double>(d35a[0]),3.0,1.0e-12,"test fpa 3");
       t.test_rel(static_cast<double>(d35a[1]),1.0,1.0e-12,"test fpa 4");
+#endif
 
       hid_t group_id2=hf.open_group("Integers");
       hid_t file_id2=hf.get_file_id();

diff --git a/src/root/root_toms748_ts.cpp b/src/root/root_toms748_ts.cpp
@@ -48,7 +48,7 @@ int main(void) {
   test_mgr t;
   t.set_output_level(1);
 
-#ifndef O2SCL_OPENSUSE
+#ifndef O2SCL_OPENSUSE_I386
 
   double a, b;
   funct f=gfn;