Merging in numba changes #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

jtle00 merged 26 commits into main from jtle00-j-dev

Sep 12, 2025

.github/workflows/publish_test_pypi.yml.old

-Original file line number
+Diff line change
@@ -0,0 +1,34 @@
+    name: Publish brightest to test PyPi (johnson)
+    on:
+      release:
+        types: [published] # Runs when a new GitHub release is published
+    jobs:
+      deploy:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout source (johnson)
+            uses: actions/checkout@v3
+            with:
+              fetch-depth: 0  # needed so setuptools_scm can get tags
+          - name: Set up Python (johnson)
+            uses: actions/setup-python@v4
+            with:
+              python-version: "3.x"
+          - name: Install dependencies (johnson)
+            run: |
+              python -m pip install --upgrade pip
+              pip install -U setuptools wheel twine build
+              pip install -U .
+          - name: Build and publish (johnson)
+            env:
+              TWINE_USERNAME: __token__
+              TWINE_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
+            run: |
+              git tag
+              python -m build .
+              twine upload --repository testpypi dist/*

brightest_path_lib/algorithm/__init__.py

-Original file line number
+Diff line change
@@ -1,2 +1,9 @@
     from .astar import AStarSearch
-    from .nbastar import NBAStarSearch
+    # Try to import the numba-optimized version first, fall back to non-numba version
+    try:
+        import numba
+        from .numba_nbastar import NBAStarSearch as NBAStarSearch
+    except (ModuleNotFoundError, ImportError):
+        # numba not available, use the non-numba version
+        from .nbastar import NBAStarSearch as NBAStarSearch

brightest_path_lib/algorithm/astar.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -31,8 +31,8 @@
  
    import numpy as np

    from queue import PriorityQueue, Queue

    from typing import List, Tuple

    from brightest_path_lib.cost import ReciprocalTransonic

    from brightest_path_lib.heuristic import EuclideanTransonic

    from brightest_path_lib.cost import Reciprocal

    from brightest_path_lib.heuristic import Euclidean

    from brightest_path_lib.image import ImageStats

    from brightest_path_lib.input import CostFunction, HeuristicFunction

    from brightest_path_lib.node import Node

    @@ -124,12 +124,12 @@ def __init__(
  
            self.open_nodes = open_nodes

            if cost_function == CostFunction.RECIPROCAL:

                self.cost_function = ReciprocalTransonic(

                self.cost_function = Reciprocal(

                    min_intensity=self.image_stats.min_intensity, 

                    max_intensity=self.image_stats.max_intensity)

            if heuristic_function == HeuristicFunction.EUCLIDEAN:

                self.heuristic_function = EuclideanTransonic(scale=self.scale)

                self.heuristic_function = Euclidean(scale=self.scale)

            self.is_canceled = False

            self.found_path = False

brightest_path_lib/algorithm/nbastar.py

-Original file line number
+Diff line change
@@ -1,6 +1,8 @@
     # algorithm/nbastar.py
-    """The New Bidirectional A* Search Algorithm is an improvement over the
+    """
+    The New Bidirectional A* Search Algorithm is an improvement over the
     original Bidirectional A* Search algorithm, which is a variation of the
     A* Search algorithm that searches from both the start and goal nodes
     simultaneously in order to find the shortest path more efficiently.
@@ Expand Down Expand Up / @@ -49,7 +51,6 @@ @@
     from brightest_path_lib.input import CostFunction, HeuristicFunction
     from brightest_path_lib.node import Node, BidirectionalNode
     class NBAStarSearch:
         """NBA* Implementation
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging in numba changes #50

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!