Changed how SCALAPACK version build is specified

mkfiles/config.mk.bgp

@@ -24,6 +24,7 @@ DEPFLAGS    = -M -MF $(DEPDIR)/$(notdir $*).Po
 #DEFS      := $(DEFS) -DDEBUG=1
 
 #SCALAPACK only necessary for pgemm tests and benchmarks 
-#SCALA      = -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack
+#LIBS      := $(LIBS) -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack -lgfortran
+#DEFS      := $(DEFS) -DUSE_SCALAPACK
 
 

mkfiles/config.mk.bgq

@@ -22,5 +22,6 @@ DEPFLAGS    = -M -MF $(DEPDIR)/$(notdir $*).Po
 #DEFS      := $(DEFS) -DDEBUG=1
 
 #SCALAPACK only necessary for pgemm tests and benchmarks 
-#SCALA      = -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack
+#LIBS      := $(LIBS) -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack -lgfortran
+#DEFS      := $(DEFS) -DUSE_SCALAPACK
 

mkfiles/config.mk.linux

@@ -19,5 +19,6 @@ DEPFLAGS    = -MT $@ -MD -MP -MF $(DEPDIR)/$(notdir $*).Po
 #DEFS      := $(DEFS) -DDEBUG=1
 
 #SCALAPACK only necessary for pgemm tests and benchmarks 
-#SCALA      = -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack
+#LIBS      := $(LIBS) -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack -lgfortran
+#DEFS      := $(DEFS) -DUSE_SCALAPACK
 

mkfiles/config.mk.nersc

@@ -19,5 +19,6 @@ DEPFLAGS    = -MT $@ -MD -MP -MF $(DEPDIR)/$(notdir $*).Po
 #DEFS      := $(DEFS) -DDEBUG=1
 
 #SCALAPACK only necessary for pgemm tests and benchmarks 
-#SCALA      = -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack
+#LIBS      := $(LIBS) -L$(HOME)/work/scalapack-2.0.2/lib -lscalapack -lgfortran
+#DEFS      := $(DEFS) -DUSE_SCALAPACK
 

src/dist_tensor/cyclopstf.cxx

@@ -98,7 +98,7 @@ int tCTF<dtype>::init(MPI_Comm const  global_context,
   TAU_FSTART(CTF);
   CTF_set_context(global_context);
   CTF_set_main_args(argc, argv);
-  CTF_mst_create(10000000);
+  CTF_mst_create(1000000000);
   initialized = 1;
   CommData_t * glb_comm = (CommData_t*)CTF_alloc(sizeof(CommData_t));
   SET_COMM(global_context, rank, np, glb_comm);

src/make/rules.mk

 all: $(DEFAULT_COMPONENTS)
 
+
 EXECUTABLES = pgemm_test nonsq_pgemm_test nonsq_pgemm_bench \
               examples dft dft_3D gemm gemm_4D trace sym3 \
               ccsdt_t3_to_t2 weight_4D test_suite fast_sym \
@@ -13,6 +14,7 @@ ALL_COMPONENTS = $(EXECUTABLES) $(LIBRARIES)
 
 $(EXECUTABLES): $(LIBRARIES)
 
+
 bindir = ${top_dir}/bin
 libdir = ${top_dir}/lib
 
@@ -21,14 +23,13 @@ DEPS += ${top_dir}/.dummy $(addprefix $(DEPDIR)/,$(notdir $(patsubst %.o,%.Po,$(
 
 _INCLUDES = $(INCLUDES) -I${top_dir}/include
 _CXXFLAGS = $(CXXFLAGS)
-_DEFS = $(DEFS)
+_DEFS = $(DEFS) 
 _LDFLAGS = $(LDFLAGS) -L${top_dir}/lib
 _DEPENDENCIES = $(DEPENDENCIES) Makefile ${top_dir}/config.mk ${top_dir}/src/make/rules.mk
 _LIBS = $(LIBS)
-pgemm_test nonsq_pgemm_test nonsq_pgemm_bench: 
-_LIBS = $(SCALA) $(LIBS)
-pgemm_test nonsq_pgemm_test nonsq_pgemm_bench: 
-_DEFS += -DUSE_SCALAPACK
+
+
+
 
 CXXCOMPILE = $(CXX) $(_DEFS) $(_INCLUDES) $(_CPPFLAGS) $(_CXXFLAGS)
 CXXCOMPILEDEPS = $(CXXCOMPILE) $(DEPFLAGS)
@@ -55,6 +56,7 @@ $(foreach d, $(patsubst -L%,%,$(filter -L%,$(1))),\
 FORCE:
 
 $(ALL_COMPONENTS):
+	echo $(CXXCOMPILEDEPS); 
 	@for dir in $(SUBDIRS) $($@_SUBDIRS); do \
 		echo "Making $@ in $$dir"; \
 		(cd $$dir && $(MAKE) $@); \