Noble testing

.github/workflows/ubuntu.yml

@@ -17,15 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ "Build Jammy", "Build Jammy OMP", "Build Noble" ]
+        name: [ "Build Noble" ]
         include:
 
-          - name: "Build Jammy"
-            release: jammy
-
-          - name: "Build Jammy OMP"
-            release: jammy-omp
-
           - name: "Build Noble"
             release: noble
 
@@ -59,21 +53,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ "Unit Jammy", "Short Jammy", "Medium Jammy", "Unit Noble" ]
+        name: [ "Unit Noble", "Short Noble", "Medium Noble" ]
         include:
 
-          - name: "Unit Jammy"
-            release: jammy
+          - name: "Unit Noble"
+            release: noble
             command: "make unittest"
             output: "test_results_unittests.xml"
 
-          - name: "Short Jammy"
-            release: jammy
+          - name: "Short Noble"
+            release: noble
             command: "make THREADS=2 test"
             output: "test_results.xml"
 
-          - name: "Medium Jammy"
-            release: jammy
+          - name: "Medium Noble"
+            release: noble
             command: "make THREADS=2 mediumtest"
             output: "test_results_medium.xml"
 
@@ -220,8 +214,8 @@ jobs:
       - name: ${{ matrix.name }} Longtesting
         run: |
          chmod 777 .
-         docker pull fluidity/actions:jammy-${{ github.sha }}
-         docker run -v $PWD:/host fluidity/actions:jammy-${{ github.sha }} /bin/bash -c "git clone https://github.com/fluidityproject/longtests && bin/testharness -x test_results_${{ matrix.name }}.xml -f ${{ matrix.name }}.xml && cp -v test_results_${{ matrix.name }}.xml /host"
+         docker pull fluidity/actions:noble-${{ github.sha }}
+         docker run -v $PWD:/host fluidity/actions:noble-${{ github.sha }} /bin/bash -c "git clone https://github.com/fluidityproject/longtests && bin/testharness -x test_results_${{ matrix.name }}.xml -f ${{ matrix.name }}.xml && cp -v test_results_${{ matrix.name }}.xml /host"
 
       - uses: actions/upload-artifact@v4
         with:

docker/Dockerfile.noble

@@ -22,7 +22,7 @@ RUN apt-get update && \
      apt-get clean
 
 WORKDIR /usr/local
-RUN curl -fsL https://gmsh.info/bin/Linux/gmsh-4.14.0-Linux64.tgz | tar --strip-components=1 -zxf -
+RUN curl -fsL https://gmsh.info/bin/Linux/gmsh-2.16.0-Linux64.tgz | tar --strip-components=1 -zxf -
 
 ENV OMPI_MCA_btl_vader_single_copy_mechanism=none
 ENV OMPI_MCA_rmaps_base_oversubscribe=1

docker/actions/Dockerfile.actions.noble

@@ -24,5 +24,8 @@ RUN make
 RUN make fltools
 RUN make manual
 
+# ensure our vtk 9.4 build is used in python vtk/vtktools
+ENV PYTHONPATH "/opt/vtk-9.4.0/lib/python3.12/site-packages/:$PYTHONPATH"
+
 # Python module 'assess' is required for some longtests
 RUN python3 -m pip install --break-system-packages assess

femtools/python_statec.c

@@ -269,7 +269,7 @@ void python_add_csr_matrix_(int *valSize, double val[], int *col_indSize, int co
   int tlen=150+*statelen;
   char t[tlen];
 
-  snprintf(t, tlen, "matrix = CsrMatrix((val,col_ind - 1,row_ptr - 1), shape=(numRows,numCols)); states['%s'].csr_matrices['%s'] = matrix",statefixed,namefixed);
+  snprintf(t, tlen, "matrix = csr_matrix((val,col_ind - 1,row_ptr - 1), shape=(numRows,numCols)); states['%s'].csr_matrices['%s'] = matrix",statefixed,namefixed);
   PyRun_SimpleString(t);
 
   // Clean up

libspud/Makefile.in

@@ -51,7 +51,7 @@ VPATH = src/
 .cpp.lo:
 	./libtool --mode=compile --tag=CXX $(CXX) $(CXXFLAGS) -c $<
 
-default: libspud.la build-diamond
+default: libspud.la build-diamond build-pyspud
 
 libspud.la: $(OBJS)
 	./libtool --mode=link --tag=FC $(FC) $(FCFLAGS) -o $(LIB) $(OBJS) $(LIBS) -rpath @prefix@/lib 
@@ -61,6 +61,9 @@ libspud.la: $(OBJS)
 build-diamond:
 	cd diamond; python3 setup.py build; cd ..
 
+build-pyspud: libspud.la
+	cd python; python3 setup.py build; cd ..
+
 test: unittest
 
 unittest: libspud.la
@@ -95,21 +98,13 @@ install-spudtools:
 	@INSTALL@ -m644 schema/spud_base.rng $(DESTDIR)@prefix@/share/spud
 
 install-diamond:
-	cd diamond;	python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	cd diamond; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
 
 install-pyspud:
-ifeq ($(origin BUILDING_DEBIAN),undefined)
 	cd python; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
-else
-	cd python; for python in $(shell py3versions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
-endif
 
 install-dxdiff:
-ifeq ($(origin BUILDING_DEBIAN),undefined)
 	cd dxdiff; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
-else
-	cd dxdiff; for python in $(shell py3versions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
-endif
 
 clean:
 	@cd doc; $(MAKE) clean

libspud/bin/spud-update-options

@@ -4,7 +4,6 @@ import glob
 import os
 import sys
 import argparse
-import string
 
 import diamond.debug as debug
 import diamond.schema as schema
@@ -57,7 +56,7 @@ for f in args.file:
     dirname = os.path.normpath(dirname)
 
     for root, dirnames, files in os.walk(dirname, topdown=True):
-      depth = string.count(root, os.path.sep)
+      depth = root.count(os.path.sep)
       for filename in glob.glob1(os.path.join(root, os.path.dirname(f)), os.path.split(f)[-1]):
         filenames.append(os.path.join(os.path.join(root, os.path.dirname(f)), filename))
         exts.add(filename.split('.')[-1])