Add CMK_MULTICORE to conv-mach-opt.mak through the configure script 10/5110/1
authorNitin Bhat <nbhat4@illinois.edu>
Fri, 19 Apr 2019 21:20:46 +0000 (16:20 -0500)
committerNitin Bhat <nbhat4@illinois.edu>
Fri, 19 Apr 2019 21:40:39 +0000 (16:40 -0500)
This change is required to make CMK_MULTICORE available to
makefiles for skipping tests/examples which cannot be run on
CMK_MULTICORE.

Change-Id: I5fb8fff07216b438789e47d8b2dee5b4d5047c6f

src/arch/multicore-arm7/conv-mach.sh
src/arch/multicore-arm8/conv-mach.sh
src/arch/multicore-darwin-x86_64/conv-mach.sh
src/arch/multicore-linux-ppc/conv-mach.sh
src/arch/multicore-linux32/conv-mach.sh
src/arch/multicore-linux64/conv-mach.sh
src/arch/multicore-win64/conv-mach.sh
src/scripts/configure.ac

index 5c1c3e1bd5b030b34c7bc0a559a66b0981e11ada..747728e31c80e2bd9686d65fc4f9d46dc21cfce9 100644 (file)
@@ -31,3 +31,5 @@ else
     CMK_F90_USE_MODDIR=1
     CMK_F90_MODINC="-p"
 fi
+
+CMK_MULTICORE='1'
index 5c1c3e1bd5b030b34c7bc0a559a66b0981e11ada..747728e31c80e2bd9686d65fc4f9d46dc21cfce9 100644 (file)
@@ -31,3 +31,5 @@ else
     CMK_F90_USE_MODDIR=1
     CMK_F90_MODINC="-p"
 fi
+
+CMK_MULTICORE='1'
index 10bae07dd1bdc048c47ce621999b8de067ab5938..e5bd726dc4f4f259f9b87c7a310f5aab69aa1025 100644 (file)
@@ -3,5 +3,6 @@
 
 CMK_DEFS="$CMK_DEFS -D_REENTRANT"
 
+CMK_MULTICORE="1"
 CMK_SMP="1"
 CMK_NO_PARTITIONS="1"
index 1b9dd8acb88d1d8a4f1114c5d4ca9fd588561f1f..66ea7714a16f2edd455cfc55fd60fe3feec70c7b 100644 (file)
@@ -33,5 +33,6 @@ else
   fi
 fi
 
+CMK_MULTICORE='1'
 CMK_SMP='1'
 CMK_NO_PARTITIONS="1"
index 8028b34dd0a5b32d2641a1612250265ec62775ac..ca03dca6b3668716e10782f21977974ab8d789b4 100644 (file)
@@ -15,6 +15,7 @@ CMK_F90_MODINC='-p'
 
 CMK_QT='generic64-light'
 
+CMK_MULTICORE='1'
 CMK_SMP='1'
 CMK_NO_PARTITIONS="1"
 
index 518853c29a53df04f7c6c3224b37bda68f0c095f..8b0421505e9549a9cd62627b6409867e5f3a2cea 100644 (file)
@@ -21,5 +21,6 @@ fi
 
 CMK_QT='generic64-light'
 
+CMK_MULTICORE='1'
 CMK_SMP='1'
 CMK_NO_PARTITIONS="1"
index 40881054d12366b3d485d49f8b5b0700b27d4d68..2409961abcbacdf81ad8fbf6f38a82231e0f09a0 100644 (file)
@@ -13,4 +13,5 @@ CMK_QT="none"
 
 . $CHARMINC/cc-msvc.sh
 
+CMK_MULTICORE="1"
 CMK_NO_PARTITIONS="1"
index 9d8eb7a1a9d36fa2e16b11923097af21316a5c8d..ed912e445e43a8e4cd5f1602e2c5eefd3f8a220c 100644 (file)
@@ -114,6 +114,7 @@ add_make_flag "CMK_SMP:=$CMK_SMP" 'basic setup'
 add_make_flag "CMK_SHARED_SUF:=$CMK_SHARED_SUF" 'basic setup'
 add_make_flag "CMK_NO_PARTITIONS:=$CMK_NO_PARTITIONS" 'basic setup'
 add_make_flag "CMK_BLUEGENEQ:=$CMK_BLUEGENEQ" 'basic setup'
+add_make_flag "CMK_MULTICORE:=$CMK_MULTICORE" 'basic setup'
 add_make_flag "BUILD_CUDA:=$BUILD_CUDA" 'basic setup'
 
 # enable/disable error checking