Merge pull request #66 from graspologic-org/ci-build-adjustments

chore: modernize build toolchain and expand platform support

Author: daxpryce

.github/workflows/build.yml

@@ -4,18 +4,21 @@ jobs:
   codestyle-check:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Check format
         run: |
           cargo fmt -- --check
+      - name: Clippy
+        run: |
+          cargo clippy --all-targets -- -D warnings
   version:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: "3.14"
       - name: Materialize build number
         run: |
           pip install -U pip
@@ -31,17 +34,49 @@ jobs:
           path: version.txt
   build:
     needs: ['codestyle-check', 'version']
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest", "windows-latest", "macos-latest", "ubuntu-24.04-arm"]
+        include:
+          - runner: ubuntu-latest
+            target: x64
+            manylinux: "2014"
+            args: -m packages/pyo3/Cargo.toml --release --sdist
+            artifact_name: dist-linux-x64
+          - runner: ubuntu-24.04-arm
+            target: aarch64
+            manylinux: "2014"
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-linux-aarch64
+          - runner: ubuntu-latest
+            target: x64
+            manylinux: musllinux_1_2
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-musllinux-x64
+          - runner: ubuntu-24.04-arm
+            target: aarch64
+            manylinux: musllinux_1_2
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-musllinux-aarch64
+          - runner: windows-latest
+            target: x64
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-windows-x64
+          - runner: windows-11-arm
+            target: aarch64-pc-windows-msvc
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-windows-aarch64
+          - runner: macos-latest
+            target: universal2-apple-darwin
+            args: -m packages/pyo3/Cargo.toml --release
+            artifact_name: dist-macos-universal2
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: "3.14"
       - uses: actions/download-artifact@v4
         with:
           name: cargo-toml
@@ -54,50 +89,25 @@ jobs:
         run: |
           cargo test --manifest-path packages/network_partitions/Cargo.toml
 
-      # the following are the actual maturin build actions. each one is different per OS, so rather than copy/paste
-      # the same steps except for the build, we conditionally do one of the builds depending on the os in question
-      # note that windows and mac don't do sdists, but ubuntu does; this is just because we don't need to repeat
-      # ourselves or overwrite the .tar.gz sdist.
-
-      - uses: PyO3/maturin-action@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        name: Maturin Build for Windows
-        with:
-          maturin-version: 1.4.0
-          command: build
-          target: x64
-          args: -m packages/pyo3/Cargo.toml --release -i ${{env.pythonLocation}}\python.exe
-
       - uses: PyO3/maturin-action@v1
-        if: ${{ matrix.os == 'macos-latest' }}
-        name: Maturin Build for MacOS
+        if: ${{ !startsWith(matrix.runner, 'windows') }}
+        name: Maturin Build
         with:
-          maturin-version: 1.4.0
           command: build
-          target: universal2-apple-darwin
-          args: -m packages/pyo3/Cargo.toml --release
+          target: ${{ matrix.target }}
+          args: ${{ matrix.args }}
+          manylinux: ${{ matrix.manylinux || 'auto' }}
 
       - uses: PyO3/maturin-action@v1
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        name: Maturin Build for Linux
+        if: ${{ startsWith(matrix.runner, 'windows') }}
+        name: Maturin Build (Windows)
         with:
-          maturin-version: 1.4.0
           command: build
-          target: x64
-          args: -m packages/pyo3/Cargo.toml --release --sdist
-          manylinux: 2014
-
-      - uses: PyO3/maturin-action@v1
-        if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
-        name: Maturin Build for Linux
-        with:
-          maturin-version: 1.4.0
-          command: build
-          target: aarch64
-          args: -m packages/pyo3/Cargo.toml --release --sdist
-          manylinux: 2014
+          target: ${{ matrix.target }}
+          args: ${{ matrix.args }} -i ${{env.pythonLocation}}\python.exe
 
       - name: Python Unittests
+        if: ${{ !matrix.manylinux || matrix.manylinux != 'musllinux_1_2' }}
         run: |
           cd packages/pyo3
           pip install ../../target/wheels/*.whl
@@ -106,35 +116,49 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.os }}
+          name: ${{ matrix.artifact_name }}
           path: |
             target/wheels/*.whl
             target/wheels/*.tar.gz
   publish:
     runs-on: ubuntu-latest
     needs: 'build'
     if: github.ref=='refs/heads/main' || github.ref=='refs/heads/dev'
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.12
+          python-version: "3.14"
       - uses: actions/download-artifact@v4
         with:
-          name: dist-ubuntu-latest
+          name: dist-linux-x64
           path: dist/
       - uses: actions/download-artifact@v4
         with:
-          name: dist-windows-latest
+          name: dist-linux-aarch64
           path: dist/
       - uses: actions/download-artifact@v4
         with:
-          name: dist-macos-latest
+          name: dist-musllinux-x64
           path: dist/
       - uses: actions/download-artifact@v4
         with:
-          name: dist-ubuntu-24.04-arm
+          name: dist-musllinux-aarch64
+          path: dist/
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist-windows-x64
+          path: dist/
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist-windows-aarch64
+          path: dist/
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist-macos-universal2
           path: dist/
       - name: Generate SHA256 files for each wheel
         run: |
@@ -160,12 +184,17 @@ jobs:
         run: |
           twine upload dist/*
       - name: Create Github Release
-        uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.GRASPOLOGIC_VERSION }}
-          release_name: graspologic-native-${{ env.GRASPOLOGIC_VERSION }}
-          body_path: "checksums.txt"
-          prerelease: github.ref=='refs/heads/dev'
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          PRERELEASE_FLAG=""
+          if [ "${{ github.ref }}" = "refs/heads/dev" ]; then
+            PRERELEASE_FLAG="--prerelease"
+          fi
+          gh release create "$GRASPOLOGIC_VERSION" \
+            --title "graspologic-native-${GRASPOLOGIC_VERSION}" \
+            --notes-file checksums.txt \
+            $PRERELEASE_FLAG \
+            dist/*.whl \
+            dist/*.tar.gz
 

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = ["packages/network_partitions", "packages/cli", "packages/pyo3"]
+resolver = "3"
 
 [profile.release]
 opt-level = 3

packages/cli/Cargo.toml

@@ -1,13 +1,12 @@
 [package]
 name = "cli"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Dax Pryce <daxpryce@microsoft.com>"]
-edition = "2018"
+edition = "2024"
 license = "MIT"
 description = "CLI Runner for the topologic associated crates (network_partitions and eventually network_automatic_layouts)"
 
 [dependencies]
-clap = "4.5"
-rand = "0.8"
-rand_xorshift = "0.3"
+clap = "4"
+rand = "0.10"
 network_partitions={path = "../network_partitions"}

packages/cli/src/leiden.rs

@@ -8,7 +8,7 @@ use network_partitions::network::prelude::*;
 use network_partitions::quality;
 
 use rand::SeedableRng;
-use rand_xorshift::XorShiftRng;
+use rand::rngs::SmallRng;
 
 use std::fs::File;
 use std::io::prelude::*;
@@ -44,12 +44,12 @@ pub fn leiden(
 
     let loaded_file_instant: Instant = Instant::now();
 
-    let mut rng: XorShiftRng = match seed {
+    let mut rng: SmallRng = match seed {
         Some(seed) => {
             println!("Using {} for PRNG seed", seed as u64);
-            XorShiftRng::seed_from_u64(seed as u64)
+            SmallRng::seed_from_u64(seed as u64)
         }
-        None => XorShiftRng::from_entropy(),
+        None => SmallRng::from_rng(&mut rand::rng()),
     };
 
     let result: Result<(bool, Clustering), CoreError> = leiden_internal(

packages/network_partitions/Cargo.toml

@@ -1,14 +1,10 @@
 [package]
 name = "network_partitions"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Dax Pryce <daxpryce@microsoft.com>"]
-edition = "2018"
+edition = "2024"
 license = "MIT"
 description = "Leiden community detection as per https://arxiv.org/abs/1810.08473"
 
 [dependencies]
-rand = "0.8"
-
-[dev-dependencies]
-rand_xorshift = "0.3"
-
+rand = "0.10"

packages/network_partitions/src/leiden/full_network_clustering.rs

@@ -257,11 +257,11 @@ mod tests {
     use crate::network::{Edge, LabeledNetwork};
     use crate::resolution;
     use rand::SeedableRng;
-    use rand_xorshift::XorShiftRng;
+    use rand::rngs::SmallRng;
 
     #[test]
     fn test_improve_initial_clustering() {
-        let mut rng: XorShiftRng = XorShiftRng::seed_from_u64(1234);
+        let mut rng: SmallRng = SmallRng::seed_from_u64(1234);
 
         // generate same graph as in java, done via Network object not InternalNetwork, then
         // generate a InternalNetwork from it

packages/network_partitions/src/leiden/full_network_work_queue.rs

@@ -4,7 +4,7 @@
 use crate::errors::CoreError;
 use std::collections::VecDeque;
 
-use rand::Rng;
+use rand::{Rng, RngExt};
 
 /// The FullNetworkWorkQueue is a composite class of a circular work queue and a vec of bools indicating
 /// when a node should be treated as stable
@@ -62,7 +62,7 @@ impl FullNetworkWorkQueue {
         let mut stable: Vec<bool> = Vec::with_capacity(len);
         for i in 0..len {
             stable.push(false);
-            let random_index: usize = rng.gen_range(0..len);
+            let random_index: usize = rng.random_range(0..len);
             permutation.swap(i, random_index);
         }
         let work_queue: VecDeque<usize> = VecDeque::from(permutation);
@@ -110,12 +110,12 @@ impl FullNetworkWorkQueue {
 mod tests {
     use super::*;
     use rand::SeedableRng;
-    use rand_xorshift::XorShiftRng;
+    use rand::rngs::SmallRng;
 
     #[test]
     fn test_determinism() {
-        let mut rng1: XorShiftRng = XorShiftRng::seed_from_u64(1234);
-        let mut rng2: XorShiftRng = XorShiftRng::seed_from_u64(1234);
+        let mut rng1: SmallRng = SmallRng::seed_from_u64(1234);
+        let mut rng2: SmallRng = SmallRng::seed_from_u64(1234);
         let order_1: FullNetworkWorkQueue =
             FullNetworkWorkQueue::items_in_random_order(100000, &mut rng1);
         let order_2: FullNetworkWorkQueue =

packages/network_partitions/src/leiden/leiden_clustering.rs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 use std::collections::{HashMap, HashSet};
-use std::iter;
 
 use rand::Rng;
 
@@ -198,8 +197,10 @@ fn initial_clustering_for_induced(
         num_nodes_per_cluster_induced_network.iter().enumerate()
     {
         // fill num_nodes_per_induced_cluster_index into positions from clusters_induced_network_index to clusters_induced_network_index + num_nodes_per_cluster_reduced_network[num_nodes_per_induced_cluster_index]
-        clusters_induced_network
-            .extend(iter::repeat(num_nodes_per_induced_cluster_index).take(*repetitions));
+        clusters_induced_network.extend(std::iter::repeat_n(
+            num_nodes_per_induced_cluster_index,
+            *repetitions,
+        ));
     }
     let next_cluster_id: usize = match clusters_induced_network.last() {
         Some(largest_cluster) => *largest_cluster + 1,
@@ -274,7 +275,7 @@ mod tests {
             ("g".into(), "c".into(), 3.0),
             ("h".into(), "d".into(), 11.0),
         ];
-        return edges;
+        edges
     }
 
     #[test]
@@ -308,7 +309,7 @@ mod tests {
             .expect("Updating this known cluster for h should work");
         clustering.remove_empty_clusters();
         assert_eq!(clustering[a_compact], clustering[h_compact]);
-        guarantee_clustering_sanity(&compact_network, &mut clustering)
+        guarantee_clustering_sanity(compact_network, &mut clustering)
             .expect("guarantee clustering sanity should not throw an error");
         assert_ne!(clustering[a_compact], clustering[h_compact]);
         let isolate_clusters: Vec<ClusterId> = vec![clustering[a_compact], clustering[h_compact]];

packages/network_partitions/src/leiden/mod.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-pub use self::hierarchical::{hierarchical_leiden, HierarchicalCluster};
+pub use self::hierarchical::{HierarchicalCluster, hierarchical_leiden};
 pub use self::leiden_clustering::leiden;
 
 mod full_network_clustering;