Merge pull request #276 from intel/develop

Develop

Makefile

@@ -146,7 +146,7 @@ clean:
 realclean: clean
 	rm -rf $(LIB_OUT_DIR) $(BIN_OUT_DIR) $(BUILD_OUT_DIR)
 	rm -fv TAGS '*~'
-	- find src include utils -name '*~' -print -delete
+	- find src include utils docs -name '*~' -print -delete
 	- find src -name '*.optrpt' -print -delete
 	- find src -name __pycache__ -print -delete
 	$(YC_MAKE) $@

src/common/common_utils.cpp

@@ -44,7 +44,7 @@ namespace yask {
     // for numbers above 9 (at least up to 99).
 
     // Format: "major.minor.patch[-alpha|-beta]".
-    const string version = "4.04.00";
+    const string version = "4.04.01";
 
     string yask_get_version_string() {
         return version;

src/kernel/yask.sh

@@ -39,8 +39,6 @@ done
 envs=""
 #envs+=" OMP_DISPLAY_ENV=VERBOSE KMP_VERSION=1"
 envs+=" OMP_PLACES=cores KMP_HOT_TEAMS_MODE=1 KMP_HOT_TEAMS_MAX_LEVEL=3"
-envs+=" I_MPI_PRINT_VERSION=1 I_MPI_DEBUG=5"
-envs+=" I_MPI_HBW_POLICY=hbw_preferred,hbw_preferred"
 
 # Default arch.
 cpu_flags=`grep -m1 '^flags' /proc/cpuinfo`
@@ -336,6 +334,14 @@ fi
 # Set MPI command default.
 if [[ $nranks > 1 ]]; then
     : ${mpi_cmd="mpirun -np $nranks"}
+
+    # Add default Intel MPI settings.
+    envs+=" I_MPI_PRINT_VERSION=1 I_MPI_DEBUG=5"
+
+    # Check whether HBM policy setting is allowed.
+    if [[ `I_MPI_HBW_POLICY=hbw_preferred,hbw_preferred mpirun -np 1 /bin/date |& grep -c 'Unknown memory policy'` == 0 ]]; then
+        envs+=" I_MPI_HBW_POLICY=hbw_preferred,hbw_preferred"
+    fi
 fi
 
 # Bail on errors past this point, but only errors