address clang compiler warnings and minor issues / memory leaks for non-core tests and examples

Author: solomonik

Makefile

@@ -41,7 +41,7 @@ TESTS = bivar_function bivar_transform ccsdt_map_test ccsdt_t3_to_t2 dft diag_ct
 
 BENCHMARKS = bench_contraction bench_nosym_transp bench_redistribution model_trainer 
 
-SCALAPACK_TESTS = nonsq_pgemm_test nonsq_pgemm_bench hosvd qr svd
+SCALAPACK_TESTS = hosvd qr svd
 
 STUDIES = fast_diagram fast_3mm fast_sym fast_sym_4D \
           fast_tensor_ctr fast_sy_as_as_tensor_ctr fast_as_as_sy_tensor_ctr

configure

@@ -565,13 +565,14 @@ fi
 
 if [ "x$LIB_PATH" = "x" ]; then
 	LIB_PATH=""
-fi
-
-if [ "x$LD_LIB_PATH" = "x" ]; then
+elif [ "x$LD_LIB_PATH" = "x" ]; then
   echo "LD_LIB_PATH was unspecified but LIB_PATH was, setting LD_LIB_PATH=$LIB_PATH."
 	LD_LIB_PATH=$LIB_PATH
 fi
-if [ "x$LD_LIBS" = "x" ]; then
+
+if [ "x$LIBS" = "x" ]; then
+	LIBS=""
+elif [ "x$LD_LIBS" = "x" ]; then
   echo "LD_LIBS was unspecified but LIBS was, setting LD_LIBS=$LIBS."
 	LD_LIBS=$LIBS
 fi

examples/ao_mo_transf.cxx

@@ -215,7 +215,7 @@ char* getCmdOption(char ** begin,
 }
 
 int main(int argc, char ** argv){
-  int m, n, k, bench, bench_io;
+  int m, n, k, bench;
   int const in_num = argc;
   char ** input_str = argv;
 

examples/block_sparse.cxx

@@ -49,6 +49,8 @@ Matrix<> flatten_block_sparse_matrix(Matrix< Tensor<> > A, std::vector<int> rang
     ends[1] = range_pfx[i]+ranges[i];
     flatA.slice(offs,ends,0.0,A_blks[b],zeros,A_blks[b].lens,1.0);
   }
+  free(blk_inds);
+  delete [] A_blks;
   return flatA;
 
 }
@@ -118,15 +120,17 @@ int block_sparse(std::vector<int> ranges, World & dw){
     A_blks[i].d.fill_random(0,1);
   }
   A.write(nblk,A_blks);
-  int64_t B_blk_inds[nblk];
-  Tensor<> B_blks[nblk];
+  int64_t * B_blk_inds = new int64_t[nblk];
+  Tensor<> * B_blks = new Tensor<>[nblk];
   for (int64_t i=0; i<nblk; i++){
     int64_t j = rand()%nblk;
     B_blk_inds[i] = i + j*nblk;
     B_blks[i] = Matrix<>(ranges[i],ranges[j],dw);
     B_blks[i].fill_random(1.,1.);
   }
   B.write(nblk,B_blk_inds,B_blks);
+  delete [] B_blks;
+  delete [] B_blk_inds;
   Matrix< Tensor<> > C(nblk, nblk, SP, self_world, tmon);
 
   C["ij"] = Function< Tensor<> >(

examples/btwn_central.cxx

@@ -347,12 +347,10 @@ int main(int argc, char ** argv){
     if (test < 0) test = 0;
   } else test = 0;
   if (getCmdOption(input_str, input_str+in_num, "-sp_B")){
-    sp_B = atoi(getCmdOption(input_str, input_str+in_num, "-sp_B"));
-    if (sp_B < 0 || sp_B > 1) sp_B = 1;
+    sp_B = (bool)atoi(getCmdOption(input_str, input_str+in_num, "-sp_B"));
   } else sp_B = 1;
   if (getCmdOption(input_str, input_str+in_num, "-sp_C")){
-    sp_C = atoi(getCmdOption(input_str, input_str+in_num, "-sp_C"));
-    if (sp_C < 0 || sp_C > 1) sp_C = 1;
+    sp_C = (bool)atoi(getCmdOption(input_str, input_str+in_num, "-sp_C"));
   } else sp_C = 1;
 
 

scalapack_tests/conj.h

@@ -2,19 +2,19 @@
 #define __CONJ_H__
 
 template <typename dtype>
-Matrix<dtype> conj(Matrix<dtype> & A){
+CTF::Matrix<dtype> conj(CTF::Matrix<dtype> & A){
   return A;
 }
 template <>
-Matrix< std::complex<float> > conj(Matrix< std::complex<float> > & A){
-  Matrix< std::complex<float> > B(A);
-  B["ij"] = Function< std::complex<float>>([](std::complex<float> a){ return std::conj(a); })(A["ij"]);
+CTF::Matrix< std::complex<float> > conj(CTF::Matrix< std::complex<float> > & A){
+  CTF::Matrix< std::complex<float> > B(A);
+  B["ij"] = CTF::Function< std::complex<float>>([](std::complex<float> a){ return std::conj(a); })(A["ij"]);
   return B;
 }
 template <>
-Matrix<std::complex<double>> conj(Matrix<std::complex<double>> & A){
-  Matrix<std::complex<double>> B(A);
-  B["ij"] = Function<std::complex<double>>([](std::complex<double> a){ return std::conj(a); })(A["ij"]);
+CTF::Matrix<std::complex<double>> conj(CTF::Matrix<std::complex<double>> & A){
+  CTF::Matrix<std::complex<double>> B(A);
+  B["ij"] = CTF::Function<std::complex<double>>([](std::complex<double> a){ return std::conj(a); })(A["ij"]);
   return B;
 }
 #endif

scalapack_tests/hosvd.cxx

@@ -135,7 +135,6 @@ Tensor<> get_core_tensor(Tensor<>& T, std::vector< Matrix <> > factor_matrices,
   char matrix_arg[3];
   matrix_arg[0] = 'a';
   matrix_arg[2] = '\0';
-  Matrix<double> transpose();
   for (int i = 0; i < T.order; i++) {
     core_arg[i] = 'a';
     matrix_arg[1] = arg[i];
@@ -192,7 +191,6 @@ Tensor<> get_core_tensor_hooi(Tensor<>& T, std::vector< Matrix <> > factor_matri
   char matrix_arg[3];
   matrix_arg[0] = 'a';
   matrix_arg[2] = '\0';
-  Matrix<double> transpose();
   for (int i = 0; i < T.order; i++) {
     if (i != j) {
       core_arg[i] = 'a';