As per RFC and telecon, deprecate cmd line options and their corresponding MCA params for old-style mapping and binding directives

cmr=v1.7.5:reviewer=jsquyres:subject=deprecate old-style mapping and binding directives

This commit was SVN r30298.

opal/mca/hwloc/base/help-opal-hwloc-base.txt

@@ -1,6 +1,7 @@
 # -*- text -*-
 #
 # Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014      Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -83,3 +84,17 @@ to be redefined:
   Prior policy:  %s
 
 Please check that only one policy is defined.
+#
+[deprecated]
+The following MCA parameter has been deprecated and will
+be replaced in future releases as follows:
+
+  Command line option:
+    Deprecated:  %s
+    Replacement: %s
+
+  MCA param:
+    Deprecated : %s
+    Replacement: %s
+
+Please update to the new syntax.

opal/mca/hwloc/base/hwloc_base_frame.c

@@ -192,6 +192,9 @@ static int opal_hwloc_base_open(mca_base_open_flag_t flags)
         }
 
         if (opal_hwloc_base_bind_to_core) {
+            opal_show_help("help-opal-hwloc-base.txt", "deprecated", true,
+                           "bind-to-core","bind-to core",
+                           "hwloc_base_bind_to_core", "hwloc_base_binding_policy=core");
             /* set binding policy to core - error if something else already set */
             if (OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy) &&
                 OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy) != OPAL_BIND_TO_CORE) {
@@ -204,6 +207,9 @@ static int opal_hwloc_base_open(mca_base_open_flag_t flags)
         }
 
         if (opal_hwloc_base_bind_to_socket) {
+            opal_show_help("help-opal-hwloc-base.txt", "deprecated", true,
+                           "bind-to-socket", "bind-to socket",
+                           "hwloc_base_bind_to_socket", "hwloc_base_binding_policy=socket");
             /* set binding policy to socket - error if something else already set */
             if (OPAL_BINDING_POLICY_IS_SET(opal_hwloc_binding_policy) &&
                 OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy) != OPAL_BIND_TO_SOCKET) {

orte/mca/rmaps/base/help-orte-rmaps-base.txt

@@ -13,6 +13,7 @@
 # Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      Los Alamos National Security, LLC.
 #                         All rights reserved. 
+# Copyright (c) 2014      Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -215,3 +216,17 @@ with the version of hwloc being used by OMPI.
   File: %s
 
 Please correct the problem and try again.
+#
+[deprecated]
+The following MCA parameter has been deprecated and will
+be replaced in future releases as follows:
+
+  Command line option:
+    Deprecated:  %s
+    Replacement: %s
+
+  MCA param:
+    Deprecated : %s
+    Replacement: %s
+
+Please update to the new syntax.

orte/mca/rmaps/base/rmaps_base_frame.c

@@ -84,13 +84,15 @@ static int orte_rmaps_base_register(mca_base_register_flag_t flags)
     orte_rmaps_base_n_pernode = 0;
     (void) mca_base_var_register("orte", "rmaps", "base", "n_pernode",
                                  "Launch n procs/node", MCA_BASE_VAR_TYPE_INT,
-                                 NULL, 0, 0, OPAL_INFO_LVL_9,
+                                 NULL, 0, 0,
+                                 OPAL_INFO_LVL_9,
                                  MCA_BASE_VAR_SCOPE_READONLY, &orte_rmaps_base_n_pernode);
 
     orte_rmaps_base_n_persocket = 0;
     (void) mca_base_var_register("orte", "rmaps", "base", "n_persocket",
                                  "Launch n procs/socket", MCA_BASE_VAR_TYPE_INT,
-                                 NULL, 0, 0, OPAL_INFO_LVL_9,
+                                 NULL, 0, 0,
+                                 OPAL_INFO_LVL_9,
                                  MCA_BASE_VAR_SCOPE_READONLY, &orte_rmaps_base_n_persocket);
 
     orte_rmaps_base_pattern = NULL;
@@ -277,6 +279,9 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
     }
 
    if (rmaps_base_bycore) {
+        orte_show_help("help-orte-rmaps-base.txt", "deprecated", true,
+                       "bycore", "map-by core",
+                       "rmaps_base_bycore", "rmaps_base_mapping_policy=core");
         /* set mapping policy to bycore - error if something else already set */
         if ((ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) &&
             ORTE_GET_MAPPING_POLICY(orte_rmaps_base.mapping) != ORTE_MAPPING_BYCORE) {
@@ -300,6 +305,9 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
     }
 
     if (rmaps_base_byslot) {
+        orte_show_help("help-orte-rmaps-base.txt", "deprecated", true,
+                       "byslot", "map-by slot",
+                       "rmaps_base_byslot", "rmaps_base_mapping_policy=slot");
         /* set mapping policy to byslot - error if something else already set */
         if ((ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) &&
             ORTE_GET_MAPPING_POLICY(orte_rmaps_base.mapping) != ORTE_MAPPING_BYSLOT) {
@@ -323,6 +331,9 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
     }
 
     if (rmaps_base_bynode) {
+        orte_show_help("help-orte-rmaps-base.txt", "deprecated", true,
+                       "bynode", "map-by node",
+                       "rmaps_base_bynode", "rmaps_base_mapping_policy=node");
         /* set mapping policy to bynode - error if something else already set */
         if ((ORTE_MAPPING_GIVEN & ORTE_GET_MAPPING_DIRECTIVE(orte_rmaps_base.mapping)) &&
             ORTE_GET_MAPPING_POLICY(orte_rmaps_base.mapping) != ORTE_MAPPING_BYNODE) {