File libpsm2-fix-compilation-for-hfi1-v5.patch of Package libpsm2

Overview Repositories Revisions Requests Users Attributes Meta

File libpsm2-fix-compilation-for-hfi1-v5.patch of Package libpsm2 (Revision bf02faaf7b463275f4144f1b573199f5)

Currently displaying revision bf02faaf7b463275f4144f1b573199f5 , Show latest

diff --git psm_context.c psm_context.c
index fd5eaa2..95368a0 100644
--- psm_context.c
+++ psm_context.c
@@ -260,10 +260,12 @@ psmi_compute_start_and_end_unit(psmi_context_t *context,long unit_param,
 				psmi_spread_hfi_selection(job_key, unit_start,
 							  unit_end, nunits);
 			}
+#ifdef PSM2_SUPPORT_IW_CMD_API
 		} else if ((context->user_info.hfi1_alg == HFI1_ALG_ACROSS_ALL) &&
 			 (nunitsactive > 1)) {
 				psmi_spread_hfi_selection(job_key, unit_start,
 							  unit_end, nunits);
+#endif
 		}
 		else {
 			*unit_start = 0;
@@ -789,8 +791,11 @@ int psmi_get_hfi_selection_algorithm(void)
 		hfi1_alg = HFI1_ALG_ACROSS;
 	else if (!strcasecmp(env_hfi1_alg.e_str, "Packed"))
 		hfi1_alg = HFI1_ALG_WITHIN;
-	else if (!strcasecmp(env_hfi1_alg.e_str, "Round Robin All"))
+#ifdef PSM2_SUPPORT_IW_CMD_API
+	else if (hfi_get_user_major_version() == IOCTL_CMD_API_MODULE_MAJOR &&
+			 !strcasecmp(env_hfi1_alg.e_str, "Round Robin All"))
 		hfi1_alg = HFI1_ALG_ACROSS_ALL;
+#endif
 	else {
 		_HFI_ERROR
 		    ("Unknown HFI selection algorithm %s. Defaulting to Round Robin "

Places

File libpsm2-fix-compilation-for-hfi1-v5.patch of Package libpsm2 (Revision bf02faaf7b463275f4144f1b573199f5)

Places