Merge branch 'main' into logging-instead-of-printing

spacemeshos · May 17, 2023 · 03bd940 · 03bd940
2 parents ef5b24c + 3d2e446
commit 03bd940
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ members = [".", "ffi", "scrypt-ocl", "initializer", "profiler"]
 
 [package]
 name = "post-rs"
-version = "0.1.8"
+version = "0.1.11"
 edition = "2021"
 
 [lib]

diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "post-cbindings"
-version = "0.1.8"
+version = "0.1.11"
 edition = "2021"
 
 

diff --git a/initializer/src/main.rs b/initializer/src/main.rs
@@ -178,7 +178,7 @@ fn initialize(args: InitializeArgs) -> eyre::Result<()> {
         InitializationMethod::Gpu => Box::new(OpenClInitializer::new(
             args.provider.map(ProviderId),
             args.n,
-            Some(DeviceType::GPU),
+            Some(DeviceType::GPU | DeviceType::CPU),
         )?),
     };
 
@@ -211,8 +211,7 @@ fn initialize(args: InitializeArgs) -> eyre::Result<()> {
 }
 
 fn list_providers() -> eyre::Result<()> {
-    let providers = scrypt_ocl::get_providers(Some(DeviceType::GPU))?;
-    println!("Found {} providers", providers.len());
+    let providers = scrypt_ocl::get_providers(Some(DeviceType::GPU | DeviceType::CPU))?;
     for (id, provider) in providers.iter().enumerate() {
         println!("{id}: {provider}");
     }

diff --git a/scrypt-ocl/Cargo.toml b/scrypt-ocl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scrypt-ocl"
-version = "0.1.8"
+version = "0.1.11"
 edition = "2021"
 
 [dependencies]