Quick attempt at resolving high env hash collision rate.

FLAMEGPU · Nov 13, 2020 · 4e55957 · 4e55957
1 parent e7d7aad
commit 4e55957
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/flamegpu/gpu/CUDASimulation.cu b/src/flamegpu/gpu/CUDASimulation.cu
@@ -190,8 +190,6 @@ bool CUDASimulation::step() {
     std::string message_name;
     Curve::NamespaceHash message_name_inp_hash = 0;
     Curve::NamespaceHash message_name_outp_hash = 0;
-    // hash model name
-    const Curve::NamespaceHash instance_id_hash = Curve::variableRuntimeHash(instance_id);
 
     // TODO: simulation.getMaxFunctionsPerLayer()
     for (auto lyr = model->layers.begin(); lyr != model->layers.end(); ++lyr) {
@@ -313,7 +311,7 @@ bool CUDASimulation::step() {
 #ifndef NO_SEATBELTS
                         error_buffer,
 #endif
-                        instance_id_hash,
+                        instance_id,
                         agent_func_name_hash,
                         state_list_size,
                         t_rng,
@@ -333,7 +331,7 @@ bool CUDASimulation::step() {
 #ifndef NO_SEATBELTS
                                 reinterpret_cast<void*>(&error_buffer),
 #endif
-                                const_cast<void*>(reinterpret_cast<const void*>(&instance_id_hash)),
+                                const_cast<void*>(reinterpret_cast<const void*>(&instance_id)),
                                 reinterpret_cast<void*>(&agent_func_name_hash),
                                 const_cast<void *>(reinterpret_cast<const void*>(&state_list_size)),
                                 reinterpret_cast<void*>(&t_rng),
@@ -533,7 +531,7 @@ bool CUDASimulation::step() {
 #ifndef NO_SEATBELTS
                     error_buffer,
 #endif
-                    instance_id_hash,
+                    instance_id,
                     agent_func_name_hash,
                     message_name_inp_hash,
                     message_name_outp_hash,
@@ -559,7 +557,7 @@ bool CUDASimulation::step() {
 #ifndef NO_SEATBELTS
                         reinterpret_cast<void*>(&error_buffer),
 #endif
-                        const_cast<void*>(reinterpret_cast<const void*>(&instance_id_hash)),
+                        const_cast<void*>(reinterpret_cast<const void*>(&instance_id)),
                         reinterpret_cast<void*>(&agent_func_name_hash),
                         reinterpret_cast<void*>(&message_name_inp_hash),
                         reinterpret_cast<void*>(&message_name_outp_hash),

diff --git a/src/flamegpu/runtime/utility/EnvironmentManager.cu b/src/flamegpu/runtime/utility/EnvironmentManager.cu
@@ -222,9 +222,8 @@ EnvironmentManager::NamePair EnvironmentManager::toName(const unsigned int &inst
  * @note Not static, because eventually we might need to use curve singleton
  */
 Curve::VariableHash EnvironmentManager::toHash(const NamePair &name) const {
-    Curve::VariableHash model_cvh = Curve::variableRuntimeHash(name.first);
     Curve::VariableHash var_cvh = Curve::variableRuntimeHash(name.second.c_str());
-    return CURVE_NAMESPACE_HASH + model_cvh + var_cvh;
+    return CURVE_NAMESPACE_HASH + name.first + var_cvh;
 }
 
 void EnvironmentManager::newProperty(const NamePair &name, const char *ptr, const size_t &length, const bool &isConst, const size_type &elements, const std::type_index &type) {