add memory control for desymmetrization, and an early check on max_nvirt to avoid overflow. Max desymmetrization size for skew symmetric or symmetric hollow tensors can now be bounded in bytes by the environment variable CTF_MAX_DESYM_SIZE.

Author: solomonik

src/contraction/contraction.cxx

@@ -362,6 +362,11 @@ namespace CTF_int {
        * \brief returns true if prescale_operands has real work to do
        */
       bool need_prescale_operands();
+
+      /**
+       * \brief returns true if tensors are small enough to desymmetrize
+       */
+      bool is_ok_to_to_desym();
   };
 
   class contraction_signature {

src/contraction/contraction.h

@@ -208,7 +208,7 @@ namespace CTF {
 
   int World::initialize(int                   argc,
                         const char * const *  argv){
-    char * mem_size, * cppn;
+    char * mem_size, * max_desym_size, * cppn;
     if (comm == MPI_COMM_WORLD && universe_exists){
       delete phys_topology;
       *this = universe;
@@ -274,15 +274,29 @@ namespace CTF {
         coeff_file = std::string(file_path);
         CTF_int::load_all_models(coeff_file);
       }
-    
+      int64_t imem_size = 0;
       mem_size = getenv("CTF_MEMORY_SIZE");
       if (mem_size != NULL){
-        int64_t imem_size = strtoull(mem_size,NULL,0);
+        imem_size = strtoull(mem_size,NULL,0);
         if (rank == 0)
           VPRINTF(1,"Memory size set to %ld by CTF_MEMORY_SIZE environment variable\n",
                     imem_size);
         CTF_int::set_mem_size(imem_size);
       }
+
+
+      max_desym_size = getenv("CTF_MAX_DESYM_SIZE");
+      if (max_desym_size != NULL){
+        int64_t imax_desym_size = strtoull(max_desym_size,NULL,0);
+        if (rank == 0)
+          VPRINTF(1,"Max desymmetrization tensor size set to %ld by CTF_AX_DESYM_SIZE environment variable\n",
+                    imax_desym_size);
+        CTF_int::set_max_desym_size(imax_desym_size);
+      } else if (imem_size != 0) {
+        CTF_int::set_max_desym_size(imem_size/6);
+      }
+
+
       cppn = getenv("CTF_PPN");
       if (cppn != NULL){
         int icppn = atoi(cppn);

src/interface/world.cxx

@@ -47,6 +47,7 @@ namespace CTF_int {
   /* fraction of total memory which can be saturated */
   double memcap = 0.5;
   int64_t mem_size = 0;
+  int64_t max_desym_size = 0;
   #define MAX_THREADS 256
   int max_threads;
   int instance_counter = 0;
@@ -81,6 +82,21 @@ namespace CTF_int {
     mem_size = size;
   }
 
+  /**
+   * \brief sets a limit on size of tensor which CTF will desymmetrize during contraction
+   */
+  void set_max_desym_size(int64_t size){
+    max_desym_size = size;
+  }
+
+  /**
+   * \brief gets limit on size of tensor which CTF will desymmetrize during contraction
+   */
+  int64_t get_max_desym_size(){
+    return max_desym_size;
+  }
+
+
   /**
    * \brief sets what fraction of the memory capacity CTF can use
    * \param[in] cap memory fraction

src/shared/memcontrol.cxx

@@ -11,6 +11,8 @@ namespace CTF_int {
   int64_t proc_bytes_available();
   void set_memcap(double cap);
   void set_mem_size(int64_t size);
+  void set_max_desym_size(int64_t size);
+  int64_t get_max_desym_size();
   int get_num_instances();
   void start_memprof(int rank);
   void stop_memprof();

src/shared/memcontrol.h

@@ -63,12 +63,8 @@ namespace CTF_int {
 #include "fompi_wrapper.h"
 
 namespace CTF_int {
-  //max total virtualization factor for mappings
-  #define MAX_NVIRT 256
-  //min total virtualization factor for mappings 
-  // (would be useful if explicit blockwise threading was enabled, which is not currently)
-  #ifndef MIN_NVIRT
-  #define MIN_NVIRT 1
+  #ifndef MAX_NVIRT
+  #define MAX_NVIRT 5000
   #endif
 
   #ifndef ENABLE_ASSERT

src/shared/util.h

@@ -3948,10 +3948,10 @@ namespace CTF_int {
     delete func;
 	}
 
-  bool tensor::has_symmetry() const {
+  bool tensor::has_symmetry(int sym_type) const {
     bool is_nonsym=true;
     for (int i=0; i<order; i++){
-      if (sym[i] != NS){
+      if ((sym_type == -1 && sym[i] != NS) || (sym_type != -1 && sym[i] == sym_type)){
         is_nonsym = false;
       }
     }

src/tensor/untyped_tensor.cxx

@@ -1042,9 +1042,10 @@ namespace CTF_int {
 
       /**
        * \brief checks if there is any symmetry defined as part of sym
-       * \return true if sym[i] != NS for some i
+       * \param[in] sym_type type of symmetry to check for
+       * \return true if sym_type = -1 and sym[i] != NS for some i or if sym[i] = sym_type
        */
-      bool has_symmetry() const;
+      bool has_symmetry(int sym_type=-1) const;
 
 
       /**