Step 2 - Variable dimensions

include/genn/backends/cuda/backend.h

@@ -408,7 +408,7 @@ class BACKEND_EXPORT Backend : public BackendSIMT
                                       [this, v](const auto &g, size_t) 
                                       { 
                                           const auto varRef = g.getVarReferences().at(v.name);
-                                          return getDeviceVarPrefix() + varRef.getVar().name + varRef.getTargetName(); ;
+                                          return getDeviceVarPrefix() + varRef.getVarName() + varRef.getTargetName(); ;
                                       });
 
                     // Add NCCL reduction

include/genn/backends/single_threaded_cpu/backend.h

@@ -254,7 +254,8 @@ class BACKEND_EXPORT Backend : public BackendBase
             // If variable is a reduction target, copy value from register straight back into global memory
             if(v.access & VarAccessModeAttribute::REDUCE) {
                 const std::string idx = env.getName(idxName);
-                env.getStream() << "group->" << v.name << "[" << cg.getVarIndex(getVarAccessDuplication(v.access), idx) << "] = " << env[v.name] << ";" << std::endl;
+                const VarAccessDim varAccessDim = getVarAccessDim(v.access, cg.getArchetype().getDims());
+                env.getStream() << "group->" << v.name << "[" << cg.getVarIndex(1, varAccessDim, idx) << "] = " << env[v.name] << ";" << std::endl;
             }
         }
 

include/genn/genn/code_generator/backendBase.h

@@ -495,16 +495,16 @@ class GENN_EXPORT BackendBase
     void buildStandardEnvironment(EnvironmentGroupMergedField<PostsynapticUpdateGroupMerged> &env, unsigned int batchSize) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<SynapseDynamicsGroupMerged> &env, unsigned int batchSize) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<SynapseDendriticDelayUpdateGroupMerged> &env, unsigned int batchSize) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateGroupMerged> &env) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateWUGroupMerged> &env) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateTransposeWUGroupMerged> &env) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateGroupMerged> &env, unsigned int batchSize) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateWUGroupMerged> &env, unsigned int batchSize) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateTransposeWUGroupMerged> &env, unsigned int batchSize) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<CustomConnectivityUpdateGroupMerged> &env) const;
 
     void buildStandardEnvironment(EnvironmentGroupMergedField<NeuronInitGroupMerged> &env, unsigned int batchSize) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<SynapseInitGroupMerged> &env, unsigned int batchSize) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateInitGroupMerged> &env) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomWUUpdateInitGroupMerged> &env) const;
-    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomWUUpdateSparseInitGroupMerged> &env) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomUpdateInitGroupMerged> &env, unsigned int batchSize) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomWUUpdateInitGroupMerged> &env, unsigned int batchSize) const;
+    void buildStandardEnvironment(EnvironmentGroupMergedField<CustomWUUpdateSparseInitGroupMerged> &env, unsigned int batchSize) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<CustomConnectivityUpdatePreInitGroupMerged> &env) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<CustomConnectivityUpdatePostInitGroupMerged> &env) const;
     void buildStandardEnvironment(EnvironmentGroupMergedField<SynapseSparseInitGroupMerged> &env, unsigned int batchSize) const;
@@ -550,18 +550,21 @@ class GENN_EXPORT BackendBase
 
     //! Helper function to generate initialisation code for any reduction operations carried out be custom update group.
     //! Returns vector of ReductionTarget structs, providing all information to write back reduction results to memory
-    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const CustomUpdateGroupMerged &cg, const std::string &idx = "") const;
+    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const CustomUpdateGroupMerged &cg, 
+                                                         unsigned int batchSize, const std::string &idx = "") const;
 
     //! Helper function to generate initialisation code for any reduction operations carried out be custom weight update group.
     //! //! Returns vector of ReductionTarget structs, providing all information to write back reduction results to memory
-    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const CustomUpdateWUGroupMerged &cg, const std::string &idx = "") const;
+    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const CustomUpdateWUGroupMerged &cg, 
+                                                         unsigned int batchSize, const std::string &idx = "") const;
 
 private:
     //--------------------------------------------------------------------------
     // Private API
     //--------------------------------------------------------------------------
-    template<typename G, typename R>
-    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const G &cg, const std::string &idx, R getVarRefIndexFn) const
+    template<typename A, typename G, typename R>
+    std::vector<ReductionTarget> genInitReductionTargets(CodeStream &os, const G &cg, unsigned int batchSize, 
+                                                         const std::string &idx, R getVarRefIndexFn) const
     {
         // Loop through variables
         std::vector<ReductionTarget> reductionTargets;
@@ -571,8 +574,9 @@ class GENN_EXPORT BackendBase
             if (v.access & VarAccessModeAttribute::REDUCE) {
                 const auto resolvedType = v.type.resolve(cg.getTypeContext());
                 os << resolvedType.getName() << " _lr" << v.name << " = " << getReductionInitialValue(getVarAccessMode(v.access), resolvedType) << ";" << std::endl;
+                const VarAccessDim varAccessDim = getVarAccessDim(v.access, cg.getArchetype().getDims());
                 reductionTargets.push_back({v.name, resolvedType, getVarAccessMode(v.access),
-                                            cg.getVarIndex(getVarAccessDuplication(v.access), idx)});
+                                            cg.getVarIndex(batchSize, varAccessDim, idx)});
             }
         }
 

include/genn/genn/code_generator/customConnectivityUpdateGroupMerged.h

@@ -80,7 +80,7 @@ class GENN_EXPORT CustomConnectivityUpdateGroupMerged : public GroupMerged<Custo
                          [arrayPrefix, v](const auto &g, size_t) 
                          { 
                              const auto varRef = A(g).getInitialisers().at(v.name);
-                             return arrayPrefix + varRef.getVar().name + varRef.getTargetName(); 
+                             return arrayPrefix + varRef.getVarName() + varRef.getTargetName(); 
                          });
         }
     }
@@ -94,7 +94,7 @@ class GENN_EXPORT CustomConnectivityUpdateGroupMerged : public GroupMerged<Custo
         for(const auto &v : archetypeAdaptor.getDefs()) {
             // If model isn't batched or variable isn't duplicated
             const auto &varRef = archetypeAdaptor.getInitialisers().at(v.name);
-            if(batchSize == 1 || !varRef.isDuplicated()) {
+            if(batchSize == 1 || !(varRef.getVarDims() & VarAccessDim::BATCH)) {
                 // Add field with qualified type which indexes private pointer field
                 const auto resolvedType = v.type.resolve(getTypeContext());
                 const auto qualifiedType = (v.access & VarAccessModeAttribute::READ_ONLY) ? resolvedType.addConst() : resolvedType;

include/genn/genn/code_generator/customUpdateGroupMerged.h

@@ -29,11 +29,11 @@ class GENN_EXPORT CustomUpdateGroupMerged : public GroupMerged<CustomUpdateInter
                            runnerVarDecl, runnerMergedStructAlloc, name);
     }
 
-    void generateCustomUpdate(const BackendBase &backend, EnvironmentExternalBase &env,
+    void generateCustomUpdate(const BackendBase &backend, EnvironmentExternalBase &env, unsigned int batchSize,
                               BackendBase::GroupHandlerEnv<CustomUpdateGroupMerged> genPostamble);
 
-    std::string getVarIndex(VarAccessDuplication varDuplication, const std::string &index) const;
-    std::string getVarRefIndex(bool delay, VarAccessDuplication varDuplication, const std::string &index) const;
+    std::string getVarIndex(unsigned int batchSize, VarAccessDim varDims, const std::string &index) const;
+    std::string getVarRefIndex(bool delay, unsigned int batchSize, VarAccessDim varDims, const std::string &index) const;
 
     //----------------------------------------------------------------------------
     // Static constants
@@ -64,11 +64,11 @@ class GENN_EXPORT CustomUpdateWUGroupMergedBase : public GroupMerged<CustomUpdat
 
     boost::uuids::detail::sha1::digest_type getHashDigest() const;
 
-    void generateCustomUpdate(const BackendBase &backend, EnvironmentExternalBase &env,
+    void generateCustomUpdate(const BackendBase &backend, EnvironmentExternalBase &env, unsigned int batchSize,
                               BackendBase::GroupHandlerEnv<CustomUpdateWUGroupMergedBase> genPostamble);
 
-    std::string getVarIndex(VarAccessDuplication varDuplication, const std::string &index) const;
-    std::string getVarRefIndex(VarAccessDuplication varDuplication, const std::string &index) const;
+    std::string getVarIndex(unsigned int batchSize, VarAccessDim varDims, const std::string &index) const;
+    std::string getVarRefIndex(unsigned int batchSize, VarAccessDim varDims, const std::string &index) const;
 
 };