Initial first fixes to get CUDA running again

Author: juntyr

Cargo.lock

@@ -20,7 +20,7 @@ contracts = "0.6.3"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 
 [target.'cfg(target_os = "cuda")'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive"], optional = true }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive"], optional = true }
 
 [target.'cfg(not(target_os = "cuda"))'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive", "host"], optional = true }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive", "host"], optional = true }

necsim/core/Cargo.toml

@@ -15,7 +15,7 @@ contracts = "0.6.3"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 
 [target.'cfg(target_os = "cuda")'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive"] }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive"] }
 
 [target.'cfg(not(target_os = "cuda"))'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive", "host"] }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive", "host"] }

necsim/impls/cuda/Cargo.toml

@@ -134,7 +134,7 @@ impl MathsCore for NvptxMathsCore {
 
         #[cfg(target_os = "cuda")]
         unsafe {
-            core::arch::asm!("copysign.f64 {}, {}, {};", out(reg64) offset, in(reg64) x, const ROUND_TRUNC_OFFSET.to_bits(), options(pure, nomem, nostack));
+            core::arch::asm!("copysign.f64 {}, {}, {};", out(reg64) offset, in(reg64) x, in(reg64) ROUND_TRUNC_OFFSET, options(pure, nomem, nostack));
         }
         #[cfg(not(target_os = "cuda"))]
         unsafe {

necsim/impls/cuda/src/cogs/maths.rs

@@ -6,8 +6,6 @@
 #![feature(const_mut_refs)]
 #![feature(const_refs_to_cell)]
 #![cfg_attr(target_os = "cuda", feature(asm_experimental_arch))]
-#![cfg_attr(target_os = "cuda", feature(asm_const))]
-#![cfg_attr(target_os = "cuda", feature(const_float_bits_conv))]
 
 extern crate alloc;
 

necsim/impls/cuda/src/lib.rs

@@ -31,7 +31,7 @@ rand_core = "0.6"
 rand_distr = { version = "0.4", default-features = false, features = [] }
 
 [target.'cfg(target_os = "cuda")'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive"], optional = true }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive"], optional = true }
 
 [target.'cfg(not(target_os = "cuda"))'.dependencies]
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive", "host"], optional = true }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive", "host"], optional = true }

necsim/impls/no-std/Cargo.toml

@@ -23,4 +23,4 @@ thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_state = "0.4"
 serde_derive_state = "0.4"
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["host"] }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["host"] }

rustcoalescence/algorithms/cuda/Cargo.toml

@@ -14,4 +14,4 @@ necsim-impls-no-std = { path = "../../../../necsim/impls/no-std", features = ["c
 necsim-impls-cuda = { path = "../../../../necsim/impls/cuda" }
 rustcoalescence-algorithms-cuda-gpu-kernel = { path = "../gpu-kernel" }
 
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["host"] }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["host"] }

rustcoalescence/algorithms/cuda/cpu-kernel/Cargo.toml

@@ -16,4 +16,4 @@ necsim-core-bond = { path = "../../../../necsim/core/bond" }
 necsim-impls-no-std = { path = "../../../../necsim/impls/no-std", features = ["cuda"] }
 necsim-impls-cuda = { path = "../../../../necsim/impls/cuda" }
 
-rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "f18ae16", features = ["derive"] }
+rust-cuda = { git = "https://github.com/MomoLangenstein/rust-cuda", rev = "56f7f2fe", features = ["derive"] }