edsger 0.1.1__cp311-cp311-win32.whl → 0.1.2__cp311-cp311-win32.whl

edsger/_version.py

@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"

edsger/dijkstra.pyx

@@ -23,6 +23,11 @@ from edsger.commons cimport (
     DTYPE_INF, UNLABELED, SCANNED, DTYPE_t, ElementState)
 cimport edsger.pq_4ary_dec_0b as pq  # priority queue
 
+# Memory prefetching support (x86/x64 only)
+cdef extern from "prefetch_compat.h":
+    void prefetch_hint(char*, int) nogil
+    int PREFETCH_T0
+
 
 cpdef cnp.ndarray compute_sssp(
         cnp.uint32_t[::1] csr_indptr,
@@ -83,8 +88,17 @@ cpdef cnp.ndarray compute_sssp(
                              <size_t>csr_indptr[tail_vert_idx + 1]):
 
                 head_vert_idx = <size_t>csr_indices[idx]
+
+                # Prefetch next iteration data to improve cache performance
+                if idx + 1 < <size_t>csr_indptr[tail_vert_idx + 1]:
+                    prefetch_hint(<char*>&csr_indices[idx + 1], PREFETCH_T0)
+                    prefetch_hint(<char*>&csr_data[idx + 1], PREFETCH_T0)
+
                 vert_state = pqueue.Elements[head_vert_idx].state
                 if vert_state != SCANNED:
+                    # Prefetch priority queue element data for the vertex
+                    prefetch_hint(<char*>&pqueue.Elements[head_vert_idx], PREFETCH_T0)
+
                     head_vert_val = tail_vert_val + csr_data[idx]
                     if vert_state == UNLABELED:
                         pq.insert(&pqueue, head_vert_idx, head_vert_val)
@@ -164,8 +178,17 @@ cpdef cnp.ndarray compute_sssp_w_path(
                              <size_t>csr_indptr[tail_vert_idx + 1]):
 
                 head_vert_idx = <size_t>csr_indices[idx]
+
+                # Prefetch next iteration data to improve cache performance
+                if idx + 1 < <size_t>csr_indptr[tail_vert_idx + 1]:
+                    prefetch_hint(<char*>&csr_indices[idx + 1], PREFETCH_T0)
+                    prefetch_hint(<char*>&csr_data[idx + 1], PREFETCH_T0)
+
                 vert_state = pqueue.Elements[head_vert_idx].state
                 if vert_state != SCANNED:
+                    # Prefetch priority queue element data for the vertex
+                    prefetch_hint(<char*>&pqueue.Elements[head_vert_idx], PREFETCH_T0)
+
                     head_vert_val = tail_vert_val + csr_data[idx]
                     if vert_state == UNLABELED:
                         pq.insert(&pqueue, head_vert_idx, head_vert_val)

edsger/path_tracking.pyx

@@ -43,7 +43,7 @@ cpdef cnp.ndarray compute_path(cnp.uint32_t[::1] path_links, int vertex_idx):
 cdef int _compute_path_first_pass(
     cnp.uint32_t[::1] path_links,
     int vertex_idx
-) nogil noexcept:
+) noexcept nogil:
     """Returns the path length.
     """
 
@@ -69,7 +69,7 @@ cdef void _compute_path_second_pass(
     cnp.uint32_t[::1] path_links,
     cnp.uint32_t[::1] path_vertices,
     int vertex_idx
-) nogil noexcept:
+) noexcept nogil:
     """Compute the sequence of vertices forming a path.
     """
     cdef size_t i, j, k

edsger/pq_4ary_dec_0b.pxd

@@ -17,13 +17,13 @@ cdef struct PriorityQueue:
     size_t* A  # array storing the binary tree
     Element* Elements  # array storing the elements
 
-cdef void init_pqueue(PriorityQueue*, size_t, size_t) nogil
-cdef void free_pqueue(PriorityQueue*) nogil
-cdef void insert(PriorityQueue*, size_t, DTYPE_t) nogil
-cdef DTYPE_t peek(PriorityQueue*) nogil
-cdef size_t extract_min(PriorityQueue*) nogil
-cdef bint is_empty(PriorityQueue*) nogil
-cdef void decrease_key(PriorityQueue*, size_t, DTYPE_t) nogil
+cdef void init_pqueue(PriorityQueue*, size_t, size_t) noexcept nogil
+cdef void free_pqueue(PriorityQueue*) noexcept nogil
+cdef void insert(PriorityQueue*, size_t, DTYPE_t) noexcept nogil
+cdef DTYPE_t peek(PriorityQueue*) noexcept nogil
+cdef size_t extract_min(PriorityQueue*) noexcept nogil
+cdef bint is_empty(PriorityQueue*) noexcept nogil
+cdef void decrease_key(PriorityQueue*, size_t, DTYPE_t) noexcept nogil
 cdef cnp.ndarray copy_keys_to_numpy(PriorityQueue*, size_t)
 
 

edsger/pq_4ary_dec_0b.pyx

@@ -47,7 +47,7 @@ from edsger.commons cimport (
 cdef void init_pqueue(
         PriorityQueue* pqueue,
         size_t heap_length,
-        size_t element_count) nogil noexcept:
+        size_t element_count) noexcept nogil:
     """
     Initialize the priority queue.
 
@@ -77,7 +77,7 @@ cdef void init_pqueue(
 
 cdef void _initialize_element(
         PriorityQueue* pqueue,
-        size_t element_idx) nogil noexcept:
+        size_t element_idx) noexcept nogil:
     """
     Initialize a single element.
 
@@ -92,7 +92,7 @@ cdef void _initialize_element(
 
 
 cdef void free_pqueue(
-        PriorityQueue* pqueue) nogil noexcept:
+        PriorityQueue* pqueue) noexcept nogil:
     """
     Free the priority queue.
 
@@ -107,7 +107,7 @@ cdef void free_pqueue(
 cdef void insert(
         PriorityQueue* pqueue,
         size_t element_idx,
-        DTYPE_t key) nogil noexcept:
+        DTYPE_t key) noexcept nogil:
     """
     Insert an element into the heap and reorder the heap.
 
@@ -134,7 +134,7 @@ cdef void insert(
 cdef void decrease_key(
         PriorityQueue* pqueue,
         size_t element_idx,
-        DTYPE_t key_new) nogil noexcept:
+        DTYPE_t key_new) noexcept nogil:
     """
     Decrease the key of a element in the heap, given its element index.
 
@@ -154,7 +154,7 @@ cdef void decrease_key(
         key_new)
 
 
-cdef DTYPE_t peek(PriorityQueue* pqueue) nogil noexcept:
+cdef DTYPE_t peek(PriorityQueue* pqueue) noexcept nogil:
     """
     Find heap min key.
 
@@ -174,7 +174,7 @@ cdef DTYPE_t peek(PriorityQueue* pqueue) nogil noexcept:
     return pqueue.Elements[pqueue.A[0]].key
 
 
-cdef bint is_empty(PriorityQueue* pqueue) nogil noexcept:
+cdef bint is_empty(PriorityQueue* pqueue) noexcept nogil:
     """
     Check if the heap is empty.
 
@@ -190,7 +190,7 @@ cdef bint is_empty(PriorityQueue* pqueue) nogil noexcept:
     return isempty
 
 
-cdef size_t extract_min(PriorityQueue* pqueue) nogil noexcept:
+cdef size_t extract_min(PriorityQueue* pqueue) noexcept nogil:
     """
     Extract element with min keay from the heap,
     and return its element index.
@@ -229,7 +229,7 @@ cdef size_t extract_min(PriorityQueue* pqueue) nogil noexcept:
 cdef cnp.ndarray copy_keys_to_numpy(
     PriorityQueue* pqueue,
     size_t vertex_count
-) noexcept:
+):
     """
     Copy the keys into a numpy array.
 
@@ -261,7 +261,7 @@ cdef cnp.ndarray copy_keys_to_numpy(
 cdef void _exchange_nodes(
         PriorityQueue* pqueue,
         size_t node_i,
-        size_t node_j) nogil noexcept:
+        size_t node_j) noexcept nogil:
     """
     Exchange two nodes in the heap.
 
@@ -286,7 +286,7 @@ cdef void _exchange_nodes(
 
 cdef void _min_heapify(
         PriorityQueue* pqueue,
-        size_t node_idx) nogil noexcept:
+        size_t node_idx) noexcept nogil:
     """
     Re-order sub-tree under a given node (given its node index)
     until it satisfies the heap property.
@@ -363,7 +363,7 @@ cdef void _min_heapify(
 cdef void _decrease_key_from_node_index(
         PriorityQueue* pqueue,
         size_t node_idx,
-        DTYPE_t key_new) nogil noexcept:
+        DTYPE_t key_new) noexcept nogil:
     """
     Decrease the key of an element in the heap, given its tree index.
 
@@ -594,7 +594,7 @@ cpdef is_empty_01():
     assert is_empty(&pqueue) == 1
     insert(&pqueue, 1, 3.0)
     assert is_empty(&pqueue) == 0
-    idx = extract_min(&pqueue)
+    _ = extract_min(&pqueue)
     assert is_empty(&pqueue) == 1
 
     free_pqueue(&pqueue)
@@ -652,7 +652,7 @@ cpdef decrease_key_01():
     free_pqueue(&pqueue)
 
 
-cdef void heapsort(DTYPE_t[::1] values_in, DTYPE_t[::1] values_out) nogil:
+cdef void heapsort(DTYPE_t[::1] values_in, DTYPE_t[::1] values_out) noexcept nogil:
     """
     Heap sort by inerting all the values into the priority queue,
     and extracting them.
@@ -676,8 +676,6 @@ cpdef sort_01(int n, random_seed=124):
     and with the numpy default sort function, compare the results.
     """
 
-    cdef PriorityQueue pqueue
-
     rng = np.random.default_rng(random_seed)
     values_in = rng.random(size=n)
     values_out = np.empty_like(values_in, dtype=DTYPE_PY)

edsger/prefetch_compat.h

@@ -0,0 +1,21 @@
+#ifndef PREFETCH_COMPAT_H
+#define PREFETCH_COMPAT_H
+
+// Cross-platform memory prefetching compatibility header
+
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__arm64__)
+    // ARM64 platforms - use ARM-specific prefetch
+    #define prefetch_hint(addr, hint) __builtin_prefetch((const void*)(addr), 0, 3)
+    #define PREFETCH_T0 0
+#elif defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
+    // x86/x64 platforms - use SSE intrinsics
+    #include <xmmintrin.h>
+    #define prefetch_hint(addr, hint) _mm_prefetch((const char*)(addr), hint)
+    #define PREFETCH_T0 _MM_HINT_T0
+#else
+    // Other platforms - no-op (compile time optimization will remove calls)
+    #define prefetch_hint(addr, hint) ((void)0)
+    #define PREFETCH_T0 0
+#endif
+
+#endif // PREFETCH_COMPAT_H

edsger/star.pyx

@@ -204,7 +204,7 @@ cdef void _coo_to_csr_uint32(
         cnp.uint32_t [::1] Ax,
         cnp.uint32_t [::1] Bp,
         cnp.uint32_t [::1] Bj,
-        cnp.uint32_t [::1] Bx) nogil noexcept:
+        cnp.uint32_t [::1] Bx) noexcept nogil:
 
     cdef:
         size_t i, row, dest
@@ -280,7 +280,7 @@ cpdef void _coo_to_csr_float64(
         cnp.float64_t [::1] Ax,
         cnp.uint32_t  [::1] Bp,
         cnp.uint32_t  [::1] Bj,
-        cnp.float64_t [::1] Bx) nogil noexcept:
+        cnp.float64_t [::1] Bx) noexcept nogil:
 
     cdef:
         size_t i, row, dest
@@ -318,7 +318,7 @@ cpdef void _coo_to_csc_float64(
         cnp.float64_t [::1] Ax,
         cnp.uint32_t  [::1] Bp,
         cnp.uint32_t  [::1] Bi,
-        cnp.float64_t [::1] Bx) nogil noexcept:
+        cnp.float64_t [::1] Bx) noexcept nogil:
 
     cdef:
         size_t i, col, dest

{edsger-0.1.1.dist-info → edsger-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edsger
-Version: 0.1.1
+Version: 0.1.2
 Summary: Graph algorithms in Cython.
 Author-email: François Pacull <francois.pacull@architecture-performance.fr>
 Maintainer-email: François Pacull <francois.pacull@architecture-performance.fr>
@@ -70,20 +70,19 @@ from edsger.path import Dijkstra
 edges = pd.DataFrame({
     'tail': [0, 0, 1, 2, 2, 3],
     'head': [1, 2, 2, 3, 4, 4],
-    'weight': [1, 4, 2, 1, 3, 1]
+    'weight': [1, 4, 2, 1.5, 3, 1]
 })
 edges
 ```
 
-|    |   tail |   head |   weight |
-|---:|-------:|-------:|---------:|
-|  0 |      0 |      1 |        1 |
-|  1 |      0 |      2 |        4 |
-|  2 |      1 |      2 |        2 |
-|  3 |      2 |      3 |        1 |
-|  4 |      2 |      4 |        3 |
-|  5 |      3 |      4 |        1 |
-
+    |    |   tail |   head |   weight |
+    |---:|-------:|-------:|---------:|
+    |  0 |      0 |      1 |      1.0 |
+    |  1 |      0 |      2 |      4.0 |
+    |  2 |      1 |      2 |      2.0 |
+    |  3 |      2 |      3 |      1.5 |
+    |  4 |      2 |      4 |      3.0 |
+    |  5 |      3 |      4 |      1.0 |
 
 ```python
 # Initialize the Dijkstra object
@@ -94,10 +93,18 @@ shortest_paths = dijkstra.run(vertex_idx=0)
 print("Shortest paths:", shortest_paths)
 ```
 
-    Shortest paths: [0. 1. 3. 4. 5.]
+    Shortest paths: [0.  1.  3.  4.5 5.5]
 
 We get the shortest paths from the source node 0 to all other nodes in the graph. The output is an array with the shortest path length to each node. A path length is the sum of the weights of the edges in the path.
 
+## Why Use Edsger?
+
+Edsger is designed to be **dataframe-friendly**, providing seamless integration with pandas workflows for graph algorithms. Also it is rather efficient. Our benchmarks on the USA road network (23.9M vertices, 57.7M edges) demonstrate nice performance:
+
+<img src="docs/source/assets/dijkstra_benchmark_comparison.png" alt="Dijkstra Performance Comparison" width="700">
+
+*Benchmark performed on Intel i9-12900H laptop.*
+
 ## Contributing
 
 We welcome contributions to the Edsger library. If you have any suggestions, bug reports, or feature requests, please open an issue on our [GitHub repository](https://github.com/aetperf/Edsger).

edsger-0.1.2.dist-info/RECORD

@@ -0,0 +1,27 @@
+edsger/.gitignore,sha256=mr9Izcwvjgv215xjRKhWEZ7vsyrKWhMqvWjSLHRYDjk,13
+edsger/__init__.py,sha256=lgtGe3cqdwWdO1DLEOx7fX3i8D4Z_2rXHSq7Xecf-NM,41
+edsger/_version.py,sha256=K5SiDdEGYMpdqXThrqwTqECJJBOQNTQDrnpc2K5mzKs,21
+edsger/commons.cp311-win32.pyd,sha256=V_JyypzUpl2QCBkxNzdTth-d8YRGAgYKyiE2i_CQb-k,19968
+edsger/commons.pxd,sha256=UshKjr5ve3Or9u75xGyGPKRz1RwCCb5N-xgNevXZ4j4,464
+edsger/commons.pyx,sha256=6Ze22eE_zwXPRAe550DEhEvu-b7hvKmwQu73rzzWMUE,839
+edsger/dijkstra.cp311-win32.pyd,sha256=bDJ9W0p_AiPxKzz7SqMErGtJS9P2J4S0In86c3KhFAs,163840
+edsger/dijkstra.pyx,sha256=5yjCC2NqXrfBe8tp1sN_XSsWF92IHFrOu-QdbOV8Rvo,17915
+edsger/networks.py,sha256=hH9sgT5Ic4TLVCjxPNzMDWNjNDbqpXMxXxLeWxCpdLE,10730
+edsger/path.py,sha256=OnXbP8Mf1rcO_9m6XsDrdXCRcLMeOb2vOAb1eHcZfM8,30395
+edsger/path_tracking.cp311-win32.pyd,sha256=q06xTpnPW5uPwe0M7Lb4ajseMJK3r0ELpWQM0E-xYJw,107008
+edsger/path_tracking.pyx,sha256=H24TLmC53I8LjbM1S5E7gS8WEb5uE_PZ8nhG6BteMYA,1900
+edsger/pq_4ary_dec_0b.cp311-win32.pyd,sha256=b9DfU4pbTjwGnQAVmxG7w29DYSTORtyIP9QjYwjh_UE,131584
+edsger/pq_4ary_dec_0b.pxd,sha256=VvXcQzJq3OGBptrbawtemagPimuqSCayGQ91Jrad894,1098
+edsger/pq_4ary_dec_0b.pyx,sha256=IzvzQerf-LYy7weQpgI0f28Q8gUrR4ENaedekXs1Jeg,18486
+edsger/prefetch_compat.h,sha256=AyAYq_ZHKk5ChaJDrZOAOYe6SprL0_2byjRbjcBGrsU,826
+edsger/spiess_florian.cp311-win32.pyd,sha256=I_35HRoAweVAZgxyeUkxge4HwokRFT-b7eS5pdukqsE,154112
+edsger/spiess_florian.pyx,sha256=tjfF9Iv8nqpp4lnv4KAjF-37ij0_SgQ0fnacVVKx-CE,9934
+edsger/star.cp311-win32.pyd,sha256=oNQxJEyNpvapZDPMMOObEcSVhHvLOqfklETkPTgJ6HQ,144896
+edsger/star.pyx,sha256=9LAIXhlccEeDgT41ico7n57FJ7PKCzhPv4f22Lphn78,9602
+edsger/utils.py,sha256=xYfOFIbYpAiZljhUOgGWy0TVNvWaMFCwbCLPBkzdVos,2097
+edsger-0.1.2.dist-info/licenses/AUTHORS.rst,sha256=8udN6bgZHdHYcVzV38y6SPnF-x6Ks0uXxxFsic6Aces,110
+edsger-0.1.2.dist-info/licenses/LICENSE,sha256=w7gRlruGxK3_4KTZAyJsOR2tML4UQgB-GNm2LerwJS0,1132
+edsger-0.1.2.dist-info/METADATA,sha256=Z2KnsYE4vh_m5tvRYU-LIyDso2Kpdl7iQQeFYH_zfhM,5273
+edsger-0.1.2.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
+edsger-0.1.2.dist-info/top_level.txt,sha256=QvhzFORJIIot6GzSnDrtGa9KQt9iifCbOC5ULlzY5dg,7
+edsger-0.1.2.dist-info/RECORD,,

edsger-0.1.1.dist-info/RECORD

@@ -1,26 +0,0 @@
-edsger/.gitignore,sha256=mr9Izcwvjgv215xjRKhWEZ7vsyrKWhMqvWjSLHRYDjk,13
-edsger/__init__.py,sha256=lgtGe3cqdwWdO1DLEOx7fX3i8D4Z_2rXHSq7Xecf-NM,41
-edsger/_version.py,sha256=8oAxKUG747GUokmxjkrWejyJa5yPNEsoJDlXxoedxTw,21
-edsger/commons.cp311-win32.pyd,sha256=0e-_CqkfFKGIFPkHekn3hA4CbDiEN_dMb8swmW5K4Lg,19968
-edsger/commons.pxd,sha256=UshKjr5ve3Or9u75xGyGPKRz1RwCCb5N-xgNevXZ4j4,464
-edsger/commons.pyx,sha256=6Ze22eE_zwXPRAe550DEhEvu-b7hvKmwQu73rzzWMUE,839
-edsger/dijkstra.cp311-win32.pyd,sha256=2jmgGPwfvFqr5HHqvnyoa0Ubvv8REKPJDskyaEo0XYo,164352
-edsger/dijkstra.pyx,sha256=0Hs3ccSGWpKx53md3kHye344u63KaunHj_gmG3_T8EE,16830
-edsger/networks.py,sha256=hH9sgT5Ic4TLVCjxPNzMDWNjNDbqpXMxXxLeWxCpdLE,10730
-edsger/path.py,sha256=OnXbP8Mf1rcO_9m6XsDrdXCRcLMeOb2vOAb1eHcZfM8,30395
-edsger/path_tracking.cp311-win32.pyd,sha256=0F1Rs7QI9uXIshUaBwjSzlbmTc0cp_ZpNWpeK3UAu9Q,107008
-edsger/path_tracking.pyx,sha256=ZyIJQucG4-pyltgjsfGuZ7B6d0bFeovCuNh34LrBSvM,1900
-edsger/pq_4ary_dec_0b.cp311-win32.pyd,sha256=yPw1zMbBlt-KHwL6zrgtj9nI581ny5wWn9_X61qse4c,131072
-edsger/pq_4ary_dec_0b.pxd,sha256=s0IsejKiG95SPgS3EX8rG86w1gzEyAkXJMaq5zj3HzE,1035
-edsger/pq_4ary_dec_0b.pyx,sha256=x9rDOYMAjS6uCyp_VQYrI1yFBY4va4sTLXn05be4rTo,18521
-edsger/spiess_florian.cp311-win32.pyd,sha256=0PKG-9F2WU_lPsOLU2vW25SvX9N2Vs89_QKft2pjq9U,154624
-edsger/spiess_florian.pyx,sha256=tjfF9Iv8nqpp4lnv4KAjF-37ij0_SgQ0fnacVVKx-CE,9934
-edsger/star.cp311-win32.pyd,sha256=GDhST8hKer0eVNkD1VkBxHHTsVVAyfNISi0QeVl75Hs,144896
-edsger/star.pyx,sha256=50sopL56DnCQokHORsJ4IydQv_Zqs39W3WZLnadwgfk,9602
-edsger/utils.py,sha256=xYfOFIbYpAiZljhUOgGWy0TVNvWaMFCwbCLPBkzdVos,2097
-edsger-0.1.1.dist-info/licenses/AUTHORS.rst,sha256=8udN6bgZHdHYcVzV38y6SPnF-x6Ks0uXxxFsic6Aces,110
-edsger-0.1.1.dist-info/licenses/LICENSE,sha256=w7gRlruGxK3_4KTZAyJsOR2tML4UQgB-GNm2LerwJS0,1132
-edsger-0.1.1.dist-info/METADATA,sha256=I6IBbA-l70HNaSOT9dlFffY90wm0eeXqbukb_-no2qo,4789
-edsger-0.1.1.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
-edsger-0.1.1.dist-info/top_level.txt,sha256=QvhzFORJIIot6GzSnDrtGa9KQt9iifCbOC5ULlzY5dg,7
-edsger-0.1.1.dist-info/RECORD,,