Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hwloc disable shared #5388

Merged
merged 5 commits into from
Jul 5, 2021
Merged

hwloc disable shared #5388

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ebf56
hwloc disable shared
liujuncheng Jul 5, 2021
39ede19
fix
liujuncheng Jul 5, 2021
7b7ee6a
Merge branch 'master' into fix_hwloc_disable_shared
oneflow-ci-bot Jul 5, 2021
bfd2f73
Merge branch 'master' into fix_hwloc_disable_shared
oneflow-ci-bot Jul 5, 2021
18a7741
Merge branch 'master' into fix_hwloc_disable_shared
oneflow-ci-bot Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/third_party/hwloc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ExternalProject_Add(pciaccess
URL_HASH MD5=${PCIACCESS_URL_HASH}
UPDATE_COMMAND ""
PATCH_COMMAND cp ${XORG_MACROS_INSTALL}/share/aclocal/xorg-macros.m4 ${PCIACCESS_SOURCE_DIR}/src/pciaccess/m4
CONFIGURE_COMMAND ${PCIACCESS_SOURCE_DIR}/src/pciaccess/autogen.sh COMMAND ${PCIACCESS_SOURCE_DIR}/src/pciaccess/configure --prefix=${PCIACCESS_INSTALL}
CONFIGURE_COMMAND ${PCIACCESS_SOURCE_DIR}/src/pciaccess/autogen.sh COMMAND ${PCIACCESS_SOURCE_DIR}/src/pciaccess/configure --prefix=${PCIACCESS_INSTALL} --enable-shared=no
BUILD_COMMAND make -j${PROC_NUM} CFLAGS=${PCIACCESS_CFLAGS}
BUILD_BYPRODUCTS ${PCIACCESS_STATIC_LIBRARIES}
INSTALL_COMMAND make install
Expand All @@ -78,7 +78,7 @@ ExternalProject_Add(hwloc
URL ${HWLOC_TAR_URL}
URL_HASH MD5=${HWLOC_URL_HASH}
UPDATE_COMMAND ""
CONFIGURE_COMMAND ${HWLOC_SOURCE_DIR}/src/hwloc/autogen.sh COMMAND ${HWLOC_SOURCE_DIR}/src/hwloc/configure --prefix=${HWLOC_INSTALL} PKG_CONFIG_PATH=${PCIACCESS_INSTALL}/lib/pkgconfig --disable-libxml2 --enable-static
CONFIGURE_COMMAND ${HWLOC_SOURCE_DIR}/src/hwloc/autogen.sh COMMAND ${HWLOC_SOURCE_DIR}/src/hwloc/configure --prefix=${HWLOC_INSTALL} PKG_CONFIG_PATH=${PCIACCESS_INSTALL}/lib/pkgconfig --disable-libxml2 --enable-static --enable-shared=no
BUILD_COMMAND make -j${PROC_NUM} CFLAGS=${HWLOC_CFLAGS}
BUILD_BYPRODUCTS ${HWLOC_STATIC_LIBRARIES}
INSTALL_COMMAND make install
Expand Down