scisoftdev-tmp-HiPOP 1.0.10__tar.gz → 1.0.12__tar.gz

{scisoftdev_tmp_hipop-1.0.10 → scisoftdev_tmp_hipop-1.0.12}/.github/workflows/ci.yaml

@@ -1,17 +1,14 @@
 name: Continuous integration checks
 
 on:
-  push:
-    branches:
-      - 'feature/**' # TODO remove feature/* once the workflow is stable
   pull_request:
     branches:
       - main
   workflow_dispatch: # Manual trigger
 
 jobs:
-  build-and-test:
 
+  build-and-test:
     name: Build & test (py ${{ matrix.python-version }} on ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
 
@@ -40,7 +37,6 @@ jobs:
         # (CMake uses this variable as a search hint).
         run: |
           brew install libomp
-          echo "OpenMP_ROOT=$(brew --prefix libomp)" >> "$GITHUB_ENV"
 
       - name: C++ core library - Configure
         run: cmake -S . -B build-cpponly -G Ninja
@@ -56,3 +52,23 @@ jobs:
 
       - name: Python wrapper - Run tests
         run: pytest
+
+  # This final job acts as a gate to ensure all the previous jobs have succeeded.
+  # It is provided to be registered as a status check for pull requests.
+  ci-passed:
+    name: CI checks all OK
+    runs-on: ubuntu-slim
+    if: always()
+    needs:
+      - build-and-test
+
+    steps:
+      - name: Ensure all CI jobs passed
+        run: |
+          for result in ${{ join(needs.*.result, ' ') }}; do
+            if [[ "$result" != "success" ]]; then
+              echo "At least one CI job did not succeed."
+              exit 1
+            fi
+          done
+          echo "All CI jobs succeeded."

{scisoftdev_tmp_hipop-1.0.10 → scisoftdev_tmp_hipop-1.0.12}/.github/workflows/deploy.yaml

@@ -9,7 +9,7 @@ jobs:
 
   check-version:
     name: Check git tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
       - uses: actions/checkout@v7
@@ -19,7 +19,7 @@ jobs:
           project_version="v$(tr -d '[:space:]' < VERSION.txt)"
           echo "Git tag = [$GITHUB_REF_NAME]"
           echo "Project version = [$project_version]"
-          if [ "$GITHUB_REF_NAME" != "$project_version" ]; then
+          if [[ "$GITHUB_REF_NAME" != "$project_version" ]]; then
             echo "Mismatch between git tag and project version (VERSION.txt), aborting deployment..."
             exit 1
           fi

{scisoftdev_tmp_hipop-1.0.10 → scisoftdev_tmp_hipop-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scisoftdev-tmp-HiPOP
-Version: 1.0.10
+Version: 1.0.12
 Summary: High Performance Optimal Path module
 Keywords: graph,graph-theory,shortest-path,dijkstra
 License-Expression: LGPL-3.0-only

scisoftdev_tmp_hipop-1.0.12/VERSION.txt

@@ -0,0 +1 @@
+1.0.12

{scisoftdev_tmp_hipop-1.0.10 → scisoftdev_tmp_hipop-1.0.12}/cpp/src/shortest_path.cpp

@@ -381,10 +381,12 @@ namespace hipop
         std::vector<std::string> origins, 
         std::vector<std::string> destinations,
         std::vector<std::unordered_map<std::string, std::string> > vecMapLabelCosts,
-        std::string cost,
-        int,
+        std::string cost, 
+        int threadNumber, 
         std::vector<setstring> vecAvailableLabels)
     {
+        omp_set_num_threads(threadNumber);
+
         int nbPath = origins.size();
         std::vector<int> emptyV;
         std::vector<int> uniqueIndices;
@@ -434,9 +436,11 @@ namespace hipop
         std::vector<std::string> origins,
         std::vector<std::unordered_map<std::string, std::string> > vecMapLabelCosts,
         std::string cost,
-        int,
+        int threadNumber,
         std::vector<setstring> vecAvailableLabels)
     {
+        omp_set_num_threads(threadNumber);
+
         int nbSPTs = origins.size();
         std::vector<ShortestPathsTree> res(nbSPTs);
 
@@ -474,9 +478,11 @@ namespace hipop
         std::vector<std::string> destinations,
         std::vector<std::unordered_map<std::string, std::string> > vecMapLabelCosts,
         std::vector<std::string> costs,
-        int,
+        int threadNumber,
         std::vector<setstring> vecAvailableLabels)
     {
+        omp_set_num_threads(threadNumber);
+
         std::vector<int> emptyV;
         std::vector<int> uniqueIndices;
         std::unordered_map<int, int> duplicateIndices;
@@ -698,8 +704,9 @@ namespace hipop
         const std::vector<std::vector<std::vector<std::string>>> &paths,
         const std::string &cost,
         const std::unordered_map<std::string, std::string> mapLabelCost,
-        int)
+        int threadNumber)
     {
+        omp_set_num_threads(threadNumber);
         int nbBatches = paths.size();
 
         std::vector<std::vector<double>> res(nbBatches);
@@ -1099,8 +1106,10 @@ namespace hipop
         double costMultiplier,
         int maxRetry,
         const std::vector<int> &kPaths,
-        int)
+        int threadNumber)
     {
+        omp_set_num_threads(threadNumber);
+
         int nbODs = origins.size();
         std::vector<std::vector<pathCost>> res(nbODs);
         OrientedGraph *privateG;
@@ -1308,7 +1317,7 @@ namespace hipop
         std::vector<std::string> destinations,
         std::vector<std::unordered_map<std::string, std::string> > vecMapLabelCosts,
         std::string cost,
-        int,
+        int threadNumber,
         std::pair<std::unordered_set<std::string>, std::unordered_set<std::string>> pairMandatoryLabels,
         double maxDiffCost,
         double maxDistInCommon,
@@ -1438,6 +1447,8 @@ namespace hipop
         }
 
         // Launch dijkstra algo for each OD in parallel
+        omp_set_num_threads(threadNumber);
+
         int nbOD = origins.size();
         std::vector<std::vector<pathCost>> res(nbOD);
 

scisoftdev_tmp_hipop-1.0.12/python/hipop/shortest_path.py

@@ -0,0 +1 @@
+from hipop.cpp.shortest_path import (dijkstra, dijkstra_single_source, floyd_warshall, parallel_dijkstra, parallel_dijkstra_single_source, parallel_dijkstra_heterogeneous_costs, parallel_k_intermodal_shortest_path, k_shortest_path, parallel_k_shortest_path, astar_euclidian_dist, compute_path_length, compute_path_cost, compute_paths_costs)

scisoftdev_tmp_hipop-1.0.10/VERSION.txt

@@ -1 +0,0 @@
-1.0.10

scisoftdev_tmp_hipop-1.0.10/python/hipop/shortest_path.py

@@ -1,68 +0,0 @@
-import functools
-import time
-
-from hipop.cpp.shortest_path import (
-    dijkstra,
-    dijkstra_single_source,
-    floyd_warshall,
-    parallel_dijkstra,
-    parallel_dijkstra_single_source,
-    parallel_dijkstra_heterogeneous_costs,
-    parallel_k_intermodal_shortest_path,
-    k_shortest_path,
-    parallel_k_shortest_path,
-    astar_euclidian_dist,
-    compute_path_length,
-    compute_path_cost,
-    compute_paths_costs,
-)
-
-_EXPORTED_FUNCTIONS = (
-    "dijkstra",
-    "dijkstra_single_source",
-    "floyd_warshall",
-    "parallel_dijkstra",
-    "parallel_dijkstra_single_source",
-    "parallel_dijkstra_heterogeneous_costs",
-    "parallel_k_intermodal_shortest_path",
-    "k_shortest_path",
-    "parallel_k_shortest_path",
-    "astar_euclidian_dist",
-    "compute_path_length",
-    "compute_path_cost",
-    "compute_paths_costs",
-)
-
-_stats = {name: {"calls": 0, "total_time": 0.0} for name in _EXPORTED_FUNCTIONS}
-
-
-def _track_calls(func):
-
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        stats = _stats[func.__name__]
-        start = time.perf_counter()
-        try:
-            return func(*args, **kwargs)
-        finally:
-            stats["calls"] += 1
-            stats["total_time"] += time.perf_counter() - start
-
-    return wrapper
-
-
-for _name in _EXPORTED_FUNCTIONS:
-    globals()[_name] = _track_calls(globals()[_name])
-del _name
-
-
-def report_hipop_call_stats():
-    """Log the number of invocations and cumulative C++ execution time for each
-    exported function that has been called at least once."""
-    at_least_one_call = False
-    for name, stats in _stats.items():
-        if stats["calls"] > 0:
-            at_least_one_call = True
-            print(f"HiPOP fun {name:<40}:    #calls = {stats['calls']:>7},    run time = {stats['total_time']:>12.6f}")
-    if not at_least_one_call:
-        print("No HiPOP functions were called.")