remove --hostfile [ci skip]

KhiopsML · Oct 10, 2024 · 7ffaaf2 · 7ffaaf2
1 parent c8c28bd
commit 7ffaaf2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/actions/test-khiops-on-iris/action.yml b/.github/actions/test-khiops-on-iris/action.yml
@@ -51,6 +51,7 @@ runs:
       shell: bash
       env:
         KHIOPS_PROC_NUMBER: 4
+        KhiopsParallelTrace: 1
         OMPI_MCA_rmaps_base_oversubscribe: true
       run: |
         cd test/LearningTest/TestKhiops/Standard/Iris/
@@ -73,14 +74,13 @@ runs:
         $PYTHON kht_test.py ../../LearningTest/TestCoclustering/Standard/Iris check
         $PYTHON kht_apply.py ../../LearningTest/TestKhiops/Standard/Iris errors | tee /tmp/khiops-log.txt
         $PYTHON kht_apply.py ../../LearningTest/TestCoclustering/Standard/Iris errors | tee /tmp/coclustering-log.txt
-        $PYTHON kht_collect_results.py ../../LearningTest/TestKhiops/Standard/Iris $GITHUB_WORKSPACE/results/khiops --collect-type warnings
-        $PYTHON kht_collect_results.py ../../LearningTest/TestCoclustering/Standard/Iris $GITHUB_WORKSPACE/results/coclustering --collect-type warnings 
+        $PYTHON kht_collect_results.py ../../LearningTest/TestKhiops/Standard/Iris $GITHUB_WORKSPACE/results/khiops --collect-type all
+        $PYTHON kht_collect_results.py ../../LearningTest/TestCoclustering/Standard/Iris $GITHUB_WORKSPACE/results/coclustering --collect-type all 
         if (grep -q error /tmp/khiops-log.txt || grep -q error /tmp/coclustering-log.txt); then
           echo "::error::Errors in Khiops run"
           false
         fi
     - name: Upload test results
-      if: failure()
       uses: actions/upload-artifact@v3
       with:
         name: test-results-${{ inputs.os-decription}}

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -31,7 +31,7 @@ jobs:
           # Linux: We use the Khiops dev debian:10 container to build with glibc 2.28
           #        It ensures compatibility with glibc >= 2.28 (in particular Rocky 8)
           - {os: ubuntu-22.04, os-family: linux-64, json-image: '{"image": "ghcr.io/khiopsml/khiops/khiopsdev-debian10:latest"}'}
-          - {os: windows-2022, os-family: win-64, json-image: '{"image": null}'}
+          # - {os: windows-2022, os-family: win-64, json-image: '{"image": null}'}
           - {os: macos-13, os-family: osx-64, json-image: '{"image": null}'}
           - {os: macos-14, os-family: osx-arm64, json-image: '{"image": null}'}
     container: ${{ fromJSON(matrix.setup.json-image) }}
@@ -95,8 +95,8 @@ jobs:
           - {os: ubuntu-20.04, os-family: linux-64}
           - {os: ubuntu-22.04, os-family: linux-64}
           - {os: ubuntu-24.04, os-family: linux-64}
-          - {os: windows-2019, os-family: win-64}
-          - {os: windows-2022, os-family: win-64}
+          # - {os: windows-2019, os-family: win-64}
+          # - {os: windows-2022, os-family: win-64}
           - {os: macos-12, os-family: osx-64}
           - {os: macos-13, os-family: osx-64}
           - {os: macos-14, os-family: osx-arm64}

diff --git a/.github/workflows/run-standard-tests.yml b/.github/workflows/run-standard-tests.yml
@@ -40,8 +40,8 @@ jobs:
     strategy:
       matrix:
         build-setup:
-          - {os: windows-2022, cmake-preset: windows-msvc}
-          - {os: ubuntu-latest, cmake-preset: linux-gcc}
+          # - {os: windows-2022, cmake-preset: windows-msvc}
+          # - {os: ubuntu-latest, cmake-preset: linux-gcc}
           - {os: macos-14, cmake-preset: macos-clang}
         config: [debug, release]
     runs-on: ${{ matrix.build-setup.os }}
@@ -88,8 +88,8 @@ jobs:
       fail-fast: false
       matrix:
         build-setup:
-          - {os: windows-2022, cmake-preset: windows-msvc}
-          - {os: ubuntu-latest, cmake-preset: linux-gcc}
+          # - {os: windows-2022, cmake-preset: windows-msvc}
+          # - {os: ubuntu-latest, cmake-preset: linux-gcc}
           - {os: macos-14, cmake-preset: macos-clang}
         running-mode: [parallel, serial]
         config: [debug, release]

diff --git a/test/LearningTestTool/py/kht_test.py b/test/LearningTestTool/py/kht_test.py
@@ -360,9 +360,9 @@ def evaluate_tool_on_test_dir(
             #    "Label standard out and standard error (stdout and stderr) with the rank of the process"
             if platform.system() == "Windows":
                 khiops_params.append("-l")
-            if platform.system() == "Darwin":
-                khiops_params.append("-host")
-                khiops_params.append("localhost")
+            # if platform.system() == "Darwin":
+            #     khiops_params.append("-host")
+            #     khiops_params.append("localhost")
             khiops_params.append("-n")
             khiops_params.append(str(tool_process_number))
         khiops_params.append(tool_exe_path)