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.

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

update PyTorch 1.4 easyconfigs to use custom easyblock (and do less downloading during installations) #11219

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
309 changes: 139 additions & 170 deletions easybuild/easyconfigs/p/PyTorch/PyTorch-1.4.0-foss-2019b-Python-3.7.4.eb

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -0,0 +1,30 @@
From 2720d63c0cb11cdd96523e3ac22a6d54811ef661 Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Fri, 10 Jul 2020 09:57:00 +0200
Subject: [PATCH] Define PSIMD_SOURCE_DIR when including FP16

Avoids a superflous redownload when *NNPACK is not used (e.g. on Power)
---
cmake/Dependencies.cmake | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index d6ffc50660675..6fb5a91338718 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -673,8 +673,13 @@ endif()

# ---[ Caffe2 depends on FP16 library for half-precision conversions
if (NOT TARGET fp16)
- if (NOT DEFINED FP16_SOURCE_DIR)
- set(FP16_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../third_party/FP16" CACHE STRING "FP16 source directory")
+ set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party")
+ # PSIMD is required by FP16
+ if(NOT DEFINED PSIMD_SOURCE_DIR)
+ set(PSIMD_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/psimd" CACHE STRING "PSimd source directory")
+ endif()
+ if(NOT DEFINED FP16_SOURCE_DIR)
+ set(FP16_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/FP16" CACHE STRING "FP16 source directory")
endif()

set(FP16_BUILD_TESTS OFF CACHE BOOL "")
@@ -0,0 +1,23 @@
From 4a48ba57e0cab63d357faf7adf93cf61106221f0 Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Mon, 7 Sep 2020 12:40:56 +0200
Subject: [PATCH] Remove pybind11 from required submodules

This can be taken from the system in which case it is not used from the
submodule. Hence the check here limits the usage unneccessarily
---
setup.py | 1 -
1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8c060a1c5e3f3..c91916ab1b1e8 100644
--- a/setup.py
+++ b/setup.py
@@ -309,7 +309,6 @@ def check_file(f):
sys.exit(1)

check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt"))
- check_file(os.path.join(third_party_path, "pybind11", "CMakeLists.txt"))
check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt'))
check_file(os.path.join(third_party_path, 'tbb', 'Makefile'))
check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt'))