Initial progress towards using rust-cuda with async

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/juntyr/rust-cuda", rev = "6b53e88", features = ["derive"], optional = true }
+rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "fc18c79", features = ["derive"], optional = true }
 
 [target.'cfg(not(target_os = "cuda"))'.dependencies]
-rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "6b53e88", features = ["derive", "host"], optional = true }
+rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "fc18c79", features = ["derive", "host"], optional = true }

necsim/core/Cargo.toml

@@ -27,8 +27,8 @@ pub trait EmigrationExit<M: MathsCore, H: Habitat<M>, G: RngCore<M>, S: LineageS
             ret_event_time,
         )) => {
             ret_lineage_reference == &old(global_reference.clone()) &&
-            ret_dispersal_origin == &old(dispersal_origin.clone()) &&
-            ret_dispersal_target == &old(dispersal_target.clone()) &&
+            ret_dispersal_origin == &old(dispersal_origin) &&
+            ret_dispersal_target == &old(dispersal_target) &&
             ret_prior_time == &old(prior_time) &&
             ret_event_time == &old(event_time)
         },

necsim/core/src/cogs/emigration_exit.rs

@@ -49,12 +49,12 @@ pub trait LocallyCoherentLineageStore<M: MathsCore, H: Habitat<M>>:
         &ret
     ).is_some(), "lineage was activated")]
     #[debug_ensures(
-        self[&ret].indexed_location == old(lineage.indexed_location.clone()),
+        self[&ret].indexed_location == old(lineage.indexed_location),
         "lineage was added to indexed_location"
     )]
     #[debug_ensures(
         self.get_global_lineage_reference_at_indexed_location(
-            &old(lineage.indexed_location.clone()), old(habitat)
+            &old(lineage.indexed_location), old(habitat)
         ) == Some(&self[&ret].global_reference),
         "lineage is now indexed at indexed_location"
     )]
@@ -117,15 +117,15 @@ pub trait GloballyCoherentLineageStore<M: MathsCore, H: Habitat<M>>:
 
     #[debug_ensures(
         self.get_local_lineage_references_at_location_unordered(
-            &old(lineage.indexed_location.location().clone()), old(habitat)
+            &old(*lineage.indexed_location.location()), old(habitat)
         ).last() == Some(&ret),
         "lineage is now indexed unordered at indexed_location.location()"
     )]
     #[debug_ensures(
         old(self.get_local_lineage_references_at_location_unordered(
             lineage.indexed_location.location(), old(habitat)
         ).len() + 1) == self.get_local_lineage_references_at_location_unordered(
-            &old(lineage.indexed_location.location().clone()), old(habitat)
+            &old(*lineage.indexed_location.location()), old(habitat)
         ).len(),
         "unordered active lineage index at given location has grown by 1"
     )]

necsim/core/src/cogs/lineage_store.rs

@@ -108,7 +108,7 @@ impl From<SpeciationEvent> for PackedEvent {
             global_lineage_reference: event.global_lineage_reference.clone(),
             prior_time: event.prior_time.get().make_negative(),
             event_time: event.event_time.get(),
-            origin: event.origin.clone(),
+            origin: event.origin,
             target: event.origin,
             coalescence: event.global_lineage_reference,
         }

necsim/core/src/event.rs

@@ -3,7 +3,7 @@ use necsim_core_bond::OffByOneU32;
 use super::Location;
 
 #[allow(clippy::module_name_repetitions, clippy::unsafe_derive_deserialize)]
-#[derive(PartialEq, Eq, Clone, Debug, serde::Deserialize, serde::Serialize, TypeLayout)]
+#[derive(PartialEq, Eq, Copy, Clone, Debug, serde::Deserialize, serde::Serialize, TypeLayout)]
 #[serde(rename = "Extent")]
 #[serde(deny_unknown_fields)]
 #[repr(C)]
@@ -58,7 +58,7 @@ impl LandscapeExtent {
         LocationIterator {
             x: self.x,
             y: self.y,
-            extent: self.clone(),
+            extent: *self,
             first_y: true,
         }
     }
@@ -186,7 +186,7 @@ mod tests {
             LocationIterator {
                 x: 0,
                 y: 0,
-                extent: extent.clone(),
+                extent,
                 first_y: true,
             }
         );
@@ -200,7 +200,7 @@ mod tests {
             LocationIterator {
                 x: 0,
                 y: 0,
-                extent: extent.clone(),
+                extent,
                 first_y: false,
             }
         );
@@ -230,7 +230,7 @@ mod tests {
             LocationIterator {
                 x: 1386,
                 y: 6812,
-                extent: extent.clone(),
+                extent,
                 first_y: true,
             }
         );
@@ -242,7 +242,7 @@ mod tests {
             LocationIterator {
                 x: 0,
                 y: 6812,
-                extent: extent.clone(),
+                extent,
                 first_y: true,
             }
         );
@@ -255,7 +255,7 @@ mod tests {
             LocationIterator {
                 x: 1386,
                 y: 6813,
-                extent: extent.clone(),
+                extent,
                 first_y: false,
             }
         );
@@ -269,7 +269,7 @@ mod tests {
             LocationIterator {
                 x: 1386,
                 y: 0,
-                extent: extent.clone(),
+                extent,
                 first_y: false,
             }
         );
@@ -283,7 +283,7 @@ mod tests {
             LocationIterator {
                 x: 1386,
                 y: 6812,
-                extent: extent.clone(),
+                extent,
                 first_y: false,
             }
         );

necsim/core/src/landscape/extent.rs

@@ -1,10 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use crate::cogs::Backup;
-
 #[allow(clippy::unsafe_derive_deserialize)]
 #[derive(
-    Eq, PartialEq, PartialOrd, Ord, Clone, Hash, Debug, Serialize, Deserialize, TypeLayout,
+    Eq, PartialEq, PartialOrd, Ord, Clone, Copy, Hash, Debug, Serialize, Deserialize, TypeLayout,
 )]
 #[serde(deny_unknown_fields)]
 #[repr(C)]
@@ -13,13 +11,6 @@ pub struct Location {
     y: u32,
 }
 
-#[contract_trait]
-impl Backup for Location {
-    unsafe fn backup_unchecked(&self) -> Self {
-        self.clone()
-    }
-}
-
 impl Location {
     #[must_use]
     pub const fn new(x: u32, y: u32) -> Self {
@@ -44,7 +35,7 @@ impl From<IndexedLocation> for Location {
 }
 
 #[derive(
-    Eq, PartialEq, PartialOrd, Ord, Clone, Hash, Debug, Serialize, Deserialize, TypeLayout,
+    Eq, PartialEq, PartialOrd, Ord, Clone, Copy, Hash, Debug, Serialize, Deserialize, TypeLayout,
 )]
 #[allow(clippy::module_name_repetitions, clippy::unsafe_derive_deserialize)]
 #[serde(from = "IndexedLocationRaw", into = "IndexedLocationRaw")]

necsim/core/src/landscape/location.rs

@@ -16,6 +16,7 @@ use crate::{
 };
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TypeLayout)]
+#[cfg_attr(feature = "cuda", derive(rust_cuda::lend::LendRustToCuda))]
 #[repr(transparent)]
 pub struct GlobalLineageReference(u64);
 
@@ -94,23 +95,30 @@ impl From<Option<GlobalLineageReference>> for LineageInteraction {
     }
 }
 
-#[allow(clippy::unsafe_derive_deserialize)]
+#[allow(clippy::unsafe_derive_deserialize, clippy::module_name_repetitions)]
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TypeLayout)]
-#[serde(deny_unknown_fields)]
+#[cfg_attr(feature = "cuda", derive(rust_cuda::lend::LendRustToCuda))]
 #[repr(C)]
+#[cuda(ignore)]
+#[serde(deny_unknown_fields)]
 pub struct Lineage {
+    #[cuda(embed)]
+    #[cuda(ignore)]
     #[serde(alias = "id", alias = "ref")]
     pub global_reference: GlobalLineageReference,
+    #[cuda(ignore)]
     #[serde(alias = "time")]
     pub last_event_time: NonNegativeF64,
+    #[cuda(ignore)]
     #[serde(alias = "loc")]
     pub indexed_location: IndexedLocation,
 }
 
 impl Lineage {
     #[must_use]
+    #[allow(clippy::no_effect_underscore_binding)]
     #[debug_ensures(
-        ret.indexed_location == old(indexed_location.clone()),
+        ret.indexed_location == old(indexed_location),
         "stores the indexed_location"
     )]
     #[debug_ensures(ret.last_event_time == 0.0_f64, "starts at t_0 = 0.0")]
@@ -178,8 +186,8 @@ impl Backup for MigratingLineage {
     unsafe fn backup_unchecked(&self) -> Self {
         Self {
             global_reference: self.global_reference.backup_unchecked(),
-            dispersal_origin: self.dispersal_origin.clone(),
-            dispersal_target: self.dispersal_target.clone(),
+            dispersal_origin: self.dispersal_origin,
+            dispersal_target: self.dispersal_target,
             prior_time: self.prior_time,
             event_time: self.event_time,
             coalescence_rng_sample: self.coalescence_rng_sample.backup_unchecked(),

necsim/core/src/lineage.rs

@@ -5,7 +5,7 @@ mod private {
     impl Sealed for super::False {}
 }
 
-pub trait Boolean: private::Sealed {
+pub trait Boolean: 'static + private::Sealed {
     const VALUE: bool;
 }
 

necsim/core/src/reporter/boolean.rs

@@ -86,7 +86,7 @@ impl<
 }
 
 #[derive(Debug, TypeLayout)]
-#[cfg_attr(feature = "cuda", derive(rust_cuda::common::LendRustToCuda))]
+#[cfg_attr(feature = "cuda", derive(rust_cuda::lend::LendRustToCuda))]
 #[cfg_attr(feature = "cuda", cuda(free = "M"))]
 #[repr(C)]
 pub struct Simulation<