From nobody Wed Oct 27 22:24:13 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5B9AA1810716; Wed, 27 Oct 2021 22:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfjsV0Bhpz4vQB; Wed, 27 Oct 2021 22:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D28C718361; Wed, 27 Oct 2021 22:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RMODNZ042929; Wed, 27 Oct 2021 22:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RMOD4O042928; Wed, 27 Oct 2021 22:24:13 GMT (envelope-from git) Date: Wed, 27 Oct 2021 22:24:13 GMT Message-Id: <202110272224.19RMOD4O042928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a46966bb3496 - main - net/mpich: replace L0 fix with upstream version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a46966bb3496e0cf8100f6acdd671d4fb90c9cdb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a46966bb3496e0cf8100f6acdd671d4fb90c9cdb commit a46966bb3496e0cf8100f6acdd671d4fb90c9cdb Author: Jan Beich AuthorDate: 2021-10-27 21:54:51 +0000 Commit: Jan Beich CommitDate: 2021-10-27 22:19:27 +0000 net/mpich: replace L0 fix with upstream version PR: 252536 Reported by: Edoardo Aprà --- net/mpich/Makefile | 1 - net/mpich/files/patch-l0-1.4.1 | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 60abfe18c3e5..24fef58e258e 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -55,7 +55,6 @@ DHYDRA_DESC= Make hydra the default process manager L0_DESC= oneAPI Level Zero support L0_LIB_DEPENDS= libze_loader.so:devel/level-zero -L0_CPPFLAGS= -DZE_IPC_MEMORY_FLAG_TBD=ZE_IPC_MEMORY_FLAG_BIAS_CACHED # 1.4.1 L0_CONFIGURE_ENV_OFF= ac_cv_header_level_zero_ze_api_h=no \ ac_cv_lib_ze_loader_zeInit=no diff --git a/net/mpich/files/patch-l0-1.4.1 b/net/mpich/files/patch-l0-1.4.1 new file mode 100644 index 000000000000..6042bc127616 --- /dev/null +++ b/net/mpich/files/patch-l0-1.4.1 @@ -0,0 +1,50 @@ +https://github.com/pmodels/mpich/pull/5623 + +src/gpu/mpl_gpu_ze.c:163:71: error: use of undeclared identifier 'ZE_IPC_MEMORY_FLAG_TBD' + zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr); + ^ + +--- src/mpi/romio/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC ++++ src/mpi/romio/mpl/src/gpu/mpl_gpu_ze.c +@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip + int mpl_err = MPL_SUCCESS; + ze_result_t ret; + ret = +- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr); ++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr); + if (ret != ZE_RESULT_SUCCESS) { + mpl_err = MPL_ERR_GPU_INTERNAL; + goto fn_fail; +--- src/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC ++++ src/mpl/src/gpu/mpl_gpu_ze.c +@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip + int mpl_err = MPL_SUCCESS; + ze_result_t ret; + ret = +- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr); ++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr); + if (ret != ZE_RESULT_SUCCESS) { + mpl_err = MPL_ERR_GPU_INTERNAL; + goto fn_fail; +--- src/pm/hydra2/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC ++++ src/pm/hydra2/mpl/src/gpu/mpl_gpu_ze.c +@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip + int mpl_err = MPL_SUCCESS; + ze_result_t ret; + ret = +- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr); ++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr); + if (ret != ZE_RESULT_SUCCESS) { + mpl_err = MPL_ERR_GPU_INTERNAL; + goto fn_fail; +--- src/pm/hydra/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC ++++ src/pm/hydra/mpl/src/gpu/mpl_gpu_ze.c +@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip + int mpl_err = MPL_SUCCESS; + ze_result_t ret; + ret = +- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr); ++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr); + if (ret != ZE_RESULT_SUCCESS) { + mpl_err = MPL_ERR_GPU_INTERNAL; + goto fn_fail;