Skip to content

Commit 51d2cf4

Browse files
authored
Remove MPI dependent in nvshmem. (#73421)
1 parent 6420b59 commit 51d2cf4

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

cmake/external/nvshmem.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ set(NVSHMEM_PATCH_COMMAND
6363
set(NVSHMEM_LIB ${NVSHMEM_INSTALL_DIR}/lib/libnvshmem.a)
6464
set(NVSHMEM_BOOTSTRAP_UID_LIB
6565
${NVSHMEM_INSTALL_DIR}/lib/nvshmem_bootstrap_uid.so.3)
66-
set(NVSHMEM_BOOTSTRAP_MPI_LIB
67-
${NVSHMEM_INSTALL_DIR}/lib/nvshmem_bootstrap_mpi.so.3)
6866
set(NVSHMEM_BOOTSTRAP_PMI_LIB
6967
${NVSHMEM_INSTALL_DIR}/lib/nvshmem_bootstrap_pmi.so.3)
7068
set(NVSHMEM_BOOTSTRAP_PMI2_LIB
@@ -100,6 +98,7 @@ ExternalProject_Add(
10098
-DNVSHMEM_IBRC_SUPPORT=1
10199
-DNVSHMEM_BUILD_TESTS=0
102100
-DNVSHMEM_BUILD_EXAMPLES=0
101+
-DNVSHMEM_MPI_SUPPORT=0
103102
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${NVSHMEM_INSTALL_DIR}
104103
BUILD_BYPRODUCTS ${NVSHMEM_LIB})
105104

python/setup.py.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,14 +1128,12 @@ if '${WITH_GPU}' == 'ON' or '${WITH_ROCM}' == 'ON':
11281128
if '${WITH_DISTRIBUTE}' == 'ON' and '${WITH_NVSHMEM}' == 'ON':
11291129
package_data['paddle.libs']+=[
11301130
os.path.basename('${NVSHMEM_BOOTSTRAP_UID_LIB}'),
1131-
os.path.basename('${NVSHMEM_BOOTSTRAP_MPI_LIB}'),
11321131
os.path.basename('${NVSHMEM_BOOTSTRAP_PMI_LIB}'),
11331132
os.path.basename('${NVSHMEM_BOOTSTRAP_PMI2_LIB}'),
11341133
os.path.basename('${NVSHMEM_TRANSPORT_IBRC_LIB}'),
11351134
os.path.basename('${NVSHMEM_TRANSPORT_IBGDA_LIB}'),
11361135
]
11371136
shutil.copy('${NVSHMEM_BOOTSTRAP_UID_LIB}', libs_path)
1138-
shutil.copy('${NVSHMEM_BOOTSTRAP_MPI_LIB}', libs_path)
11391137
shutil.copy('${NVSHMEM_BOOTSTRAP_PMI_LIB}', libs_path)
11401138
shutil.copy('${NVSHMEM_BOOTSTRAP_PMI2_LIB}', libs_path)
11411139
shutil.copy('${NVSHMEM_TRANSPORT_IBRC_LIB}', libs_path)

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,14 +1550,12 @@ def get_package_data_and_package_dir():
15501550
if len(env_dict.get("NVSHMEM_BOOTSTRAP_UID_LIB", "")) > 1:
15511551
package_data['paddle.libs'] += [
15521552
os.path.basename(env_dict.get("NVSHMEM_BOOTSTRAP_UID_LIB")),
1553-
os.path.basename(env_dict.get("NVSHMEM_BOOTSTRAP_MPI_LIB")),
15541553
os.path.basename(env_dict.get("NVSHMEM_BOOTSTRAP_PMI_LIB")),
15551554
os.path.basename(env_dict.get("NVSHMEM_BOOTSTRAP_PMI2_LIB")),
15561555
os.path.basename(env_dict.get("NVSHMEM_TRANSPORT_IBRC_LIB")),
15571556
os.path.basename(env_dict.get("NVSHMEM_TRANSPORT_IBGDA_LIB")),
15581557
]
15591558
shutil.copy(env_dict.get("NVSHMEM_BOOTSTRAP_UID_LIB"), libs_path)
1560-
shutil.copy(env_dict.get("NVSHMEM_BOOTSTRAP_MPI_LIB"), libs_path)
15611559
shutil.copy(env_dict.get("NVSHMEM_BOOTSTRAP_PMI_LIB"), libs_path)
15621560
shutil.copy(env_dict.get("NVSHMEM_BOOTSTRAP_PMI2_LIB"), libs_path)
15631561
shutil.copy(env_dict.get("NVSHMEM_TRANSPORT_IBRC_LIB"), libs_path)

0 commit comments

Comments
 (0)