chore: happy little adjustments

Author: eegli

.python-version

@@ -1 +1 @@
-3.12
+3.13

Makefile

@@ -1,5 +1,5 @@
 .PHONY: all
-all: install bindings lint check_types test build_release
+all: install bindings lint check_types test
 
 .PHONY: install
 install:

crates/pyrust-bindings/src/lib.rs

@@ -5,8 +5,9 @@ mod py_globals {
     use super::*;
 
     #[pyfunction]
-    pub fn num_cpus() -> usize {
-        pyrust_internal::num_cpus_available()
+    #[pyo3(signature = (physical_only=false))]
+    pub fn num_cpus(physical_only: bool) -> usize {
+        pyrust_internal::num_cpus_available(physical_only)
     }
 
     pub const BACKEND: &str = "Rust!";

crates/pyrust-cli/src/cli.rs

@@ -16,9 +16,13 @@ pub enum Subcommand {
         name: String,
     },
 
-    /// Print the number of CPUs available on the system.
+    /// Print the number of (logical) CPU cores available on the system.
     #[clap(name = "num-cpus")]
-    NumCPUs,
+    NumCPUs {
+        #[clap(long, short, default_value = "false")]
+        /// Only count physical CPU cores.
+        physical: bool,
+    },
 
     /// Estimate the value of pi using a Monte Carlo method.
     EstimatePi {
@@ -43,8 +47,8 @@ pub fn run(args: Option<&Vec<String>>) {
         Subcommand::Greet { name } => {
             println!("Hello, {name}!",);
         }
-        Subcommand::NumCPUs => {
-            println!("{}", num_cpus_available());
+        Subcommand::NumCPUs { physical } => {
+            println!("{}", num_cpus_available(physical));
         }
         Subcommand::EstimatePi {
             num_samples,

crates/pyrust-internal/src/lib.rs

@@ -1,5 +1,9 @@
 pub mod pi;
 
-pub fn num_cpus_available() -> usize {
-    num_cpus::get()
+pub fn num_cpus_available(physical_only: bool) -> usize {
+    if physical_only {
+        num_cpus::get_physical()
+    } else {
+        num_cpus::get()
+    }
 }

pyproject.toml

@@ -2,7 +2,7 @@
 name = "pyrust"
 description = "Bindings for the pyrust-internal crate"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 license = { file = "LICENSE" }
 authors = [
     { name = "Eric Egli", email = "43848365+eegli@users.noreply.github.com" },
@@ -19,12 +19,7 @@ strip = true
 pyrust = "pyrust.__main__:launch_cli"
 
 [dependency-groups]
-dev = [
-    "maturin>=1.8.1",
-    "mypy>=1.15.0",
-    "pytest>=8.3.4",
-    "ruff>=0.9.4",
-]
+dev = ["maturin>=1.8.1", "mypy>=1.15.0", "pytest>=8.3.4", "ruff>=0.9.4"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

python/pyrust/_bindings.pyi

@@ -2,7 +2,7 @@
 
 backend: str
 
-def num_cpus() -> int: ...
+def num_cpus(physical_only: bool = False) -> int: ...
 
 # cli is defined as a submodule:
 # https://pyo3.rs/v0.23.4/module.html#python-submodules. note that

tests/unit/test_lib.py

@@ -5,7 +5,7 @@
 
 
 def test_num_cpus() -> None:
-    num_cpus_result = num_cpus()
+    num_cpus_result = num_cpus(physical_only=False)
     assert_type(num_cpus_result, int)
     assert num_cpus_result > 0