SMLP package build and test for python3.12

.github/workflows/build-wheels.yml

@@ -20,12 +20,15 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0    # for setuptools_scm to work
+      - name: Get version
+        id: version
+        run: echo "version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.4.1
         env:
           # see <https://cibuildwheel.pypa.io/en/stable/options/#build-skip>
-          CIBW_BUILD: cp311-*
+          CIBW_BUILD: cp311-* cp312-*
           CIBW_SKIP: cp*-musllinux_*
           # pin manylinux version
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
@@ -45,6 +48,5 @@ jobs:
 
       - uses: actions/upload-artifact@v7
         with:
-          #name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          name: cibw-wheels-${{ steps.version.outputs.version }}
           path: ./wheelhouse/*.whl
-          archive: false

pyproject.toml

@@ -26,21 +26,27 @@ license-files = [
 	"AUTHORS",
 ]
 readme = "README.md"
-requires-python = "==3.11.*"
+requires-python = ">=3.11,<3.13"
 dependencies = [
     "doepy",
     "jenkspy",
     "keras-tuner",
+    "keras==2.15.0; python_version<'3.12'",
+    "keras==3.14.1; python_version>='3.12'",
     "matplotlib",
+    "ml_dtypes==0.5.4; python_version>='3.12'",
     "mrmr-selection",
     "pandas",
-    "pycaret",
+    "pycaret;  python_version<'3.12'",
+    "pycaret-ni;  python_version>='3.12'",
     "pyDOE",
     "pysubgroup==0.8.0",
     "scikit-learn==1.4.2",
     "scipy",
     "seaborn",
-    "tensorflow==2.15.1",
+    "tensorboard; python_version>='3.12'",
+    "tensorflow==2.15.1; python_version<'3.12'",
+    "tensorflow==2.21.0; python_version>='3.12'",
 ]
 
 [project.urls]

regr_smlp/code/smlp_regr.py

@@ -697,6 +697,7 @@ def worker(q, id_q, print_l):
                     print('command (2)', command);
 
                 with print_l:
+                    print("")
                     print("Running test {0} test type: {1}, description: {2}".format(test_id, test_type,
                                                                                      test_description))
                     print(command + '\n')

regr_smlp/master/Test100_smlp_toy_num_resp_mult_smlp_model_term.json

@@ -1 +1 @@
-"{'y1_scaled': <smlp.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 0 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 1 0)))))>, 'y2_scaled': <smlp.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 1 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 0 0)))))>}"
+"{'y1_scaled': <smlp.core.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 0 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 1 0)))))>, 'y2_scaled': <smlp.core.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 1 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 0 0)))))>}"

regr_smlp/master/Test102_test101_model.txt

@@ -35,7 +35,7 @@ smlp_logger - INFO - PREPARE DATA FOR MODELING
 
 smlp_logger - INFO - LOAD TRAINED MODEL
 
-smlp_logger - INFO - Seving model rerun configuration in file ./../models/test101_model_rerun_model_config.json
+smlp_logger - INFO - Seving model rerun configuration in file ../models/test101_model_rerun_model_config.json
 
 smlp_logger - INFO - Creating model exploration base components: Start
 

regr_smlp/master/Test105_smlp_toy_num_resp_mult_smlp_model_term.json

@@ -1 +1 @@
-"{'y1_scaled': <smlp.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 0 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 1 0)))))>, 'y2_scaled': <smlp.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 1 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 0 0)))))>}"
+"{'y1_scaled': <smlp.core.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 0 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 1 0)))))>, 'y2_scaled': <smlp.core.libsmlp.term2 (ite (and (<= p2_scaled (/ 53687093 134217728)) (<= x_scaled (/ 44739243 67108864))) 1 (ite (and (<= p2_scaled (/ 53687093 134217728)) (> x_scaled (/ 44739243 67108864))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (<= p2_scaled (/ 23488103 33554432))) 0 (ite (and (> p2_scaled (/ 53687093 134217728)) (> p1_scaled (/ 3 4))) 1 (ite (and (and (and (> p2_scaled (/ 53687093 134217728)) (<= p1_scaled (/ 3 4))) (<= x_scaled (/ 33554433 67108864))) (> p2_scaled (/ 23488103 33554432))) 0 0)))))>}"