Use inline declaration for static members

Signed-off-by: cyy <cyyever@outlook.com>

Author: cyyever

src/DirectConv.h

@@ -53,16 +53,16 @@ class DirectConvCodeGenBase {
       int o1Xoc,
       int i1);
 
-  static std::mutex rtMutex_; ///< Control access to runtime;
+  inline static std::mutex rtMutex_; ///< Control access to runtime;
 
   // The hash depends on accumulate, mc, nc, ncb, kcb, nr, mr
-  static CodeCache<
+  inline static CodeCache<
       std::tuple<bool, int, int, int, int, int, int>,
       jit_micro_kernel_fp>
       codeCache_; ///< JIT Code Cache for reuse.
 
   // The hash depends on accumulate, stride, mr, nr
-  static CodeCache<
+  inline static CodeCache<
       std::tuple<bool, int, int, int>,
       jit_micro_kernel_fp_convT>
       codeCacheT_; ///< JIT Code Cache for reuse.
@@ -205,19 +205,4 @@ class DirectConvCodeGenBase {
   }
 };
 
-template <typename TA, typename TB, typename TC, typename accT>
-std::mutex DirectConvCodeGenBase<TA, TB, TC, accT>::rtMutex_;
-
-template <typename TA, typename TB, typename TC, typename accT>
-CodeCache<
-    std::tuple<bool, int, int, int, int, int, int>,
-    typename DirectConvCodeGenBase<TA, TB, TC, accT>::jit_micro_kernel_fp>
-    DirectConvCodeGenBase<TA, TB, TC, accT>::codeCache_;
-
-template <typename TA, typename TB, typename TC, typename accT>
-CodeCache<
-    std::tuple<bool, int, int, int>,
-    typename DirectConvCodeGenBase<TA, TB, TC, accT>::jit_micro_kernel_fp_convT>
-    DirectConvCodeGenBase<TA, TB, TC, accT>::codeCacheT_;
-
 } // namespace fbgemm

src/EmbeddingSpMDM.cc

@@ -117,12 +117,12 @@ class GenEmbeddingSpMDMLookup {
     return rt;
   }
 
-  static std::mutex rtMutex_; ///< Controll access to runtime;
+  inline static std::mutex rtMutex_; ///< Control access to runtime;
 
   // The hash depends on embedding dimension (block size), weighted sls,
-  // positional weights, normalize by lenths, prefetch distance, use_offsets,
+  // positional weights, normalize by lengths, prefetch distance, use_offsets,
   // output_stride, input_stride, and scale_bias_last
-  static CodeCache<
+  inline static CodeCache<
       std::tuple<int, bool, bool, bool, int, bool, int, int, bool, bool, bool>,
       typename ReturnFunctionSignature<
           inType,
@@ -134,49 +134,6 @@ class GenEmbeddingSpMDMLookup {
       codeCache_; ///< JIT Code Cache for reuse.
 }; // GenEmbeddingSpmDMLookup
 
-template <
-    typename inType,
-    typename indxType,
-    typename offsetType,
-    typename outType,
-    inst_set_t instSet,
-    bool ROWWISE_SPARSE,
-    bool THREAD_LOCAL>
-std::mutex GenEmbeddingSpMDMLookup<
-    inType,
-    indxType,
-    offsetType,
-    outType,
-    instSet,
-    ROWWISE_SPARSE,
-    THREAD_LOCAL>::rtMutex_;
-
-template <
-    typename inType,
-    typename indxType,
-    typename offsetType,
-    typename outType,
-    inst_set_t instSet,
-    bool ROWWISE_SPARSE,
-    bool THREAD_LOCAL>
-CodeCache<
-    std::tuple<int, bool, bool, bool, int, bool, int, int, bool, bool, bool>,
-    typename ReturnFunctionSignature<
-        inType,
-        indxType,
-        offsetType,
-        outType,
-        ROWWISE_SPARSE>::jit_embedding_kernel,
-    THREAD_LOCAL>
-    GenEmbeddingSpMDMLookup<
-        inType,
-        indxType,
-        offsetType,
-        outType,
-        instSet,
-        ROWWISE_SPARSE,
-        THREAD_LOCAL>::codeCache_;
-
 template <
     typename inType,
     typename indxType,

src/EmbeddingSpMDMNBit.cc

@@ -104,18 +104,18 @@ class GenEmbeddingSpMDMNBitLookup {
  private:
   static asmjit::JitRuntime& runtime() {
     static asmjit::JitRuntime rt; //< JIT Runtime for asmjit,
-                                  // depents on other static
+                                  // depends on other static
                                   // variables.  Required to prevent
                                   // initialization order fiasco
     return rt;
   }
 
-  static mutex rtMutex_; ///< Controll access to runtime;
+  inline static mutex rtMutex_; ///< Control access to runtime;
 
   // The hash depends on bit_rate, embedding dimension (block size), weighted
-  // sls, positional weights, normalize by lenths, prefetch distance,
+  // sls, positional weights, normalize by lengths, prefetch distance,
   // use_offsets, output_stride, input_stride, and scale_bias_last
-  static CodeCache<
+  inline static CodeCache<
       tuple<int, int, bool, bool, bool, int, bool, int, int, bool, bool>,
       typename ReturnFunctionSignature<
           indxType,
@@ -126,44 +126,6 @@ class GenEmbeddingSpMDMNBitLookup {
       codeCache_; ///< JIT Code Cache for reuse.
 }; // GenEmbeddingSpmDMLookup
 
-template <
-    typename indxType,
-    typename offsetType,
-    typename outType,
-    inst_set_t instSet,
-    bool ROWWISE_SPARSE,
-    bool THREAD_LOCAL>
-mutex GenEmbeddingSpMDMNBitLookup<
-    indxType,
-    offsetType,
-    outType,
-    instSet,
-    ROWWISE_SPARSE,
-    THREAD_LOCAL>::rtMutex_;
-
-template <
-    typename indxType,
-    typename offsetType,
-    typename outType,
-    inst_set_t instSet,
-    bool ROWWISE_SPARSE,
-    bool THREAD_LOCAL>
-CodeCache<
-    tuple<int, int, bool, bool, bool, int, bool, int, int, bool, bool>,
-    typename ReturnFunctionSignature<
-        indxType,
-        offsetType,
-        outType,
-        ROWWISE_SPARSE>::jit_embedding_kernel,
-    THREAD_LOCAL>
-    GenEmbeddingSpMDMNBitLookup<
-        indxType,
-        offsetType,
-        outType,
-        instSet,
-        ROWWISE_SPARSE,
-        THREAD_LOCAL>::codeCache_;
-
 template <
     typename indxType,
     typename offsetType,

src/GenerateKernel.h

@@ -138,22 +138,13 @@ class CodeGenBase {
     return rt;
   }
 
-  static std::mutex rtMutex_; ///< Controll access to runtime;
+  inline static std::mutex rtMutex_; ///< Controll access to runtime;
 
   // The hash depends on accumulate, mc, nc, ncb, kcb, nr, mr
-  static CodeCache<
+  inline static CodeCache<
       std::tuple<bool, int, int, int, int, int, int>,
       jit_micro_kernel_fp>
       codeCache_; ///< JIT Code Cache for reuse.
 };
 
-template <typename TA, typename TB, typename TC, typename accT>
-std::mutex CodeGenBase<TA, TB, TC, accT>::rtMutex_;
-
-template <typename TA, typename TB, typename TC, typename accT>
-CodeCache<
-    std::tuple<bool, int, int, int, int, int, int>,
-    typename CodeGenBase<TA, TB, TC, accT>::jit_micro_kernel_fp>
-    CodeGenBase<TA, TB, TC, accT>::codeCache_;
-
 } // namespace fbgemm

src/GroupwiseConv.h

@@ -171,9 +171,9 @@ class GenConvKernelBase {
     return rt;
   }
 
-  static std::mutex rtMutex_; ///< Control access to runtime;
+  inline static std::mutex rtMutex_; ///< Control access to runtime;
 
-  static CodeCache<
+  inline static CodeCache<
       kernel_sig_t,
       jit_conv_kernel_fp>
       codeCache_; ///< JIT Code Cache for reuse.
@@ -325,11 +325,4 @@ class FBGEMM_API GenConvKernel
   x86::Gp scratchReg2_;
 };
 
-template <int SPATIAL_DIM, inst_set_t INST_SET>
-std::mutex GenConvKernelBase<SPATIAL_DIM, INST_SET>::rtMutex_;
-
-template <int SPATIAL_DIM, inst_set_t INST_SET>
-CodeCache<kernel_sig_t, jit_conv_kernel_fp>
-    GenConvKernelBase<SPATIAL_DIM, INST_SET>::codeCache_;
-
 } // namespace fbgemm

src/RowWiseSparseAdagradFused.cc

@@ -66,38 +66,18 @@ class GenRowWiseSparseAdagradFused {
     return rt;
   }
 
-  static mutex rtMutex_; /// Controll access to runtime;
+  inline static mutex rtMutex_; /// Control access to runtime;
 
   // The hash depends on:
   // avx2 mask array, embedding dimension (block size), prefetch distance,
   // use_offsets and use_stochastic_rouding switch
-  static CodeCache<
+  inline static CodeCache<
       tuple<const int*, int, int, bool, bool, int>,
       typename ReturnFunctionSignature<indxType, offsetType, dataType>::
           jit_sparse_adagrad_kernel>
       codeCache_; ///< JIT Code Cache for reuse.
 }; // class GenRowWiseSparseAdagradFused
 
-template <
-    typename indxType,
-    typename offsetType,
-    typename dataType,
-    inst_set_t instSet>
-mutex GenRowWiseSparseAdagradFused<indxType, offsetType, dataType, instSet>::
-    rtMutex_;
-
-template <
-    typename indxType,
-    typename offsetType,
-    typename dataType,
-    inst_set_t instSet>
-CodeCache<
-    tuple<const int*, int, int, bool, bool, int>,
-    typename ReturnFunctionSignature<indxType, offsetType, dataType>::
-        jit_sparse_adagrad_kernel>
-    GenRowWiseSparseAdagradFused<indxType, offsetType, dataType, instSet>::
-        codeCache_;
-
 template <
     typename indxType,
     typename offsetType,

src/SparseAdagrad.cc

@@ -89,11 +89,11 @@ class GenSparseAdagrad {
     return rt;
   }
 
-  static std::mutex rtMutex_; /// Controll access to runtime;
+  inline static std::mutex rtMutex_; /// Controll access to runtime;
 
   // The hash depends on embedding dimension (block size), prefetch distance,
   // rowwise, and has_weight_decay
-  static CodeCache<
+  inline static CodeCache<
       std::tuple<int, int, bool, bool>,
       typename ReturnFunctionSignature<indxType>::jit_sparse_adagrad_kernel>
       codeCache_; ///< JIT Code Cache for reuse.
@@ -111,14 +111,6 @@ class GenSparseAdagrad {
   x86::KReg reduce_mask_avx512_;
 }; // GenEmbeddingLookup
 
-template <typename indxType, inst_set_t instSet>
-std::mutex GenSparseAdagrad<indxType, instSet>::rtMutex_;
-
-template <typename indxType, inst_set_t instSet>
-CodeCache<
-    std::tuple<int, int, bool, bool>,
-    typename ReturnFunctionSignature<indxType>::jit_sparse_adagrad_kernel>
-    GenSparseAdagrad<indxType, instSet>::codeCache_;
 
 template <typename indxType, inst_set_t instSet>
 void GenSparseAdagrad<indxType, instSet>::genSparseAdagrad(