Merge pull request #61 from glotzerlab/test-rust-1.83

Test with rust 1.83
glotzerlab · Dec 2, 2024 · 3e2e39b · 3e2e39b
2 parents 6f4e9e8 + 5fe3ba0
commit 3e2e39b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -13,7 +13,7 @@ on:
   workflow_dispatch:
 
 env:
-  RUST_VERSION: 1.81.0
+  RUST_VERSION: 1.83.0
 
 jobs:
   pre-commit:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -26,7 +26,7 @@ env:
   name: row
   CARGO_TERM_COLOR: always
   CLICOLOR: 1
-  RUST_VERSION: 1.81.0
+  RUST_VERSION: 1.83.0
 
 jobs:
   source:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -20,7 +20,7 @@ env:
   CARGO_TERM_COLOR: always
   ROW_COLOR: always
   CLICOLOR: 1
-  RUST_LATEST_VERSION: 1.81.0
+  RUST_LATEST_VERSION: 1.83.0
 
 jobs:
   unit_test:
@@ -34,14 +34,14 @@ jobs:
         rust:
           # Oldest supported version of rust
           - 1.77.2
-          - 1.81.0
+          - 1.83.0
         mode:
          - debug
 
         include:
         # Add a release build on linux with the latest version of rust
         - os: ubuntu-22.04
-          rust: 1.81.0
+          rust: 1.83.0
           mode: release
 
     steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,9 +5,6 @@ ci:
   # rust does not work on pre-commit.ci
   skip: [fmt, check, clippy]
 
-default_language_version:
-  rust: 1.81.0
-
 repos:
 - repo: https://github.com/backplane/pre-commit-rust-hooks
   rev: v1.1.0

diff --git a/src/cluster.rs b/src/cluster.rs
@@ -267,7 +267,7 @@ impl Cluster {
             self.partition
                 .iter()
                 .find(|p| p.matches(resources, n_directories, &mut reason))
-                .ok_or_else(|| Error::PartitionNotFound(reason))?
+                .ok_or(Error::PartitionNotFound(reason))?
         };
 
         Ok(partition)

diff --git a/src/scheduler/slurm.rs b/src/scheduler/slurm.rs
@@ -94,8 +94,10 @@ impl Scheduler for Slurm {
             let _ = writeln!(preamble, "#SBATCH --gpus-per-task={gpus_per_process}");
 
             if let Some(ref gpus_per_node) = partition.gpus_per_node {
-                let n_nodes = (action.resources.total_gpus(directories.len()) + gpus_per_node - 1)
-                    / gpus_per_node;
+                let n_nodes = action
+                    .resources
+                    .total_gpus(directories.len())
+                    .div_ceil(*gpus_per_node);
                 let _ = writeln!(preamble, "#SBATCH --nodes={n_nodes}");
             }
 
@@ -104,8 +106,10 @@ impl Scheduler for Slurm {
             }
         } else {
             if let Some(ref cpus_per_node) = partition.cpus_per_node {
-                let n_nodes = (action.resources.total_cpus(directories.len()) + cpus_per_node - 1)
-                    / cpus_per_node;
+                let n_nodes = action
+                    .resources
+                    .total_cpus(directories.len())
+                    .div_ceil(*cpus_per_node);
                 let _ = writeln!(preamble, "#SBATCH --nodes={n_nodes}");
             }