From 1cffe0681e3236b744618c364367248cd9df18de Mon Sep 17 00:00:00 2001
From: Tim Jammer <tim.jammer@tu-darmstadt.de>
Date: Thu, 2 May 2024 20:25:11 +0200
Subject: [PATCH] fix wrong merge resolution
---
scripts/Infrastructure/CorrectParameter.py | 4 ++--
scripts/Infrastructure/TemplateFactory.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/Infrastructure/CorrectParameter.py b/scripts/Infrastructure/CorrectParameter.py
index 504b69824..b42d9cb8f 100644
--- a/scripts/Infrastructure/CorrectParameter.py
+++ b/scripts/Infrastructure/CorrectParameter.py
@@ -1,7 +1,7 @@
#! /usr/bin/python3
from scripts.Infrastructure import MPICall
from scripts.Infrastructure.Instruction import Instruction
-#from scripts.Infrastructure.MPICallFactory import MPICallFactory
+# from scripts.Infrastructure.MPICallFactory import MPICallFactory
from scripts.Infrastructure.AllocCall import AllocCall, get_free
@@ -33,7 +33,7 @@ class CorrectParameterFactory:
if param in ["DATATYPE", "datatype", "sendtype", "recvtype", "origin_datatype", "target_datatype",
"result_datatype"]:
return self.dtype[1]
- if param in ["DEST", "dest", "target_rank"]:
+ if param in ["DEST", "dest", "rank", "target_rank"]:
return "0"
if param in ["SRC", "source"]:
return "1"
diff --git a/scripts/Infrastructure/TemplateFactory.py b/scripts/Infrastructure/TemplateFactory.py
index d0f470bee..2d69d5bc8 100644
--- a/scripts/Infrastructure/TemplateFactory.py
+++ b/scripts/Infrastructure/TemplateFactory.py
@@ -800,7 +800,6 @@ def get_intercomm(comm_create_func: str, tm: TemplateManager, before_idx: int =
:return: name of result variable
"""
assert comm_create_func in ["mpi_intercomm_create", "mpi_intercomm_create_from_groups", "mpi_intercomm_merge"]
- assert name != "intercomm_base_comm"
if comm_create_func == "mpi_intercomm_create":
base_comm = tm.add_stack_variable("MPI_Comm")
--
GitLab