Changeset 20323

Timestamp:

03/18/16 12:44:22 (9 years ago)

Author:

schlegel

Message:

CHG: bring discover back up to date with new dakota, and do not hardcode mkl for pfe

Location:

issm/trunk-jpl

Files:

• externalpackages/boost/configs/1.55/adl.hpp.patch (added)
• externalpackages/boost/install-1.55-discover.sh (added)
• m4/issm_options.m4 (modified) (1 diff)
• src/m/classes/clusters/discover.m (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -1397 +1397 @@
                 MKLINCL=""
                 if test x$VENDOR = xintel-pleiades; then
-                   MKLLIB="-Wl,-rpath,/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64 -L/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
+         MKLLIB="-Wl,-rpath,$MKL_ROOT -L/$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
                 elif test x$VENDOR = xintel-discover; then
-                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread"
+                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm"
                 elif test x$VENDOR = xintel-acenet; then
                         MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"

issm/trunk-jpl/src/m/classes/clusters/discover.m

@@ -94 +94 @@
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
 
+                         executable='issm.exe';
+                         if isdakota,
+                                 version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+                                 if (version>=6),
+                                         executable='issm_dakota.exe';
+                                 end
+                         end
+
                          %write queuing script
                          fid=fopen([modelname '.queue'],'w');
@@ -121 +129 @@
                          fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
 
-                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -131 +139 @@
                                  fid=fopen([modelname '.run'],'w');
                                  if ~isvalgrind,
-                                         fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                         fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                                  else
-                                         fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                                         fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
                                  end
                                  if ~io_gather, %concatenate the output files: