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

Changes to support building R-keras and dependencies on POWER9 #9544

Closed
wants to merge 11 commits into from
Closed

Changes to support building R-keras and dependencies on POWER9 #9544

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9841b0e
Changes to support building R-keras and dependencies on POWER9
edmondac Dec 18, 2019
f013263
Adding patch for R on ppc from https://bugs.debian.org/cgi-bin/bugrep…
edmondac Dec 18, 2019
a6092a7
Adding another patch for R on ppc for a new config.guess
edmondac Dec 19, 2019
6cac517
Delete R-3.6.2_config.guess.patch
edmondac Dec 19, 2019
7ab5940
Adding another patch for R on ppc for a new config.guess for cubature
edmondac Dec 19, 2019
632a356
Removing liquidSVM as it is old and assumes intel hardware
edmondac Dec 20, 2019
dc183dc
Merge branch 'develop' into 20191218143904_new_pr_Mesa1917
edmondac Jan 10, 2020
dec26ca
Update R-3.6.2-foss-2019b.eb
edmondac Jan 23, 2020
ab277de
Delete cubature_2.0.4_config_guess.patch
edmondac Jan 23, 2020
431d8a8
Update R-3.6.2-fosscuda-2019b.eb
edmondac Jan 23, 2020
b9c71a5
Merge branch 'develop' into 20191218143904_new_pr_Mesa1917
edmondac Mar 23, 2020
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
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/l/libdrm/libdrm-2.4.99-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ builddependencies = [
dependencies = [('X11', '20190717')]

sanity_check_paths = {
'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
edmondac marked this conversation as resolved.
Show resolved Hide resolved
'files': ['include/xf86drm.h', 'include/xf86drmMode.h',
'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
}
Expand Down
4 changes: 1 addition & 3 deletions easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# it will try to use the llvmpipe by default. It you want swr, do:
# GALLIUM_DRIVER=swr

easyblock = 'MesonNinja'
edmondac marked this conversation as resolved.
Show resolved Hide resolved

name = 'Mesa'
version = '19.1.7'

Expand Down Expand Up @@ -54,7 +52,7 @@ dependencies = [
]

configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri3=false -Ddri-drivers='' -Dvulkan-drivers=''"
configopts += " -Dgbm=false -Dglx-direct=false -Dgallium-drivers='swrast,swr' -Degl=false"
configopts += " -Dgbm=false -Dglx-direct=false -Degl=false"
configopts += " -Dllvm=true -Dshared-llvm=true"
configopts += " -Dlibunwind=true -Dglx=gallium-xlib"

Expand Down
3 changes: 0 additions & 3 deletions easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# it will try to use the llvmpipe by default. It you want swr, do:
# GALLIUM_DRIVER=swr

easyblock = 'MesonNinja'

name = 'Mesa'
version = '19.2.1'

Expand Down Expand Up @@ -61,7 +59,6 @@ dependencies = [
]

configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri-drivers='' -Dvulkan-drivers=''"
configopts += " -Dgallium-drivers='swrast,swr' -Dswr-arches=avx,avx2,skx,knl"
configopts += " -Dllvm=true -Dshared-llvm=true"
configopts += " -Dlibunwind=true"
configopts += " -Dglvnd=true"
Expand Down
12 changes: 8 additions & 4 deletions easybuild/easyconfigs/r/R/R-3.6.2-foss-2019b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ toolchain = {'name': 'foss', 'version': '2019b'}

source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s']
sources = [SOURCE_TAR_GZ]
checksums = ['bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954']
patches = [
'%(name)s-%(version)s_base_ppc64le.patch',
]
checksums = [
'bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954', # R-3.6.2.tar.gz
'905b632f391bf0ccc9f326c54914a03dfb9eb3ef7bc6865e7fd5c2f2eb733f93', # R-3.6.2_base_ppc64le.patch
]

builddependencies = [
('pkg-config', '0.29.2'),
Expand Down Expand Up @@ -243,6 +249,7 @@ exts_list = [
'checksums': ['faa25754b757fe483b876f5d07b73f76f69a1baa971420892fadec4af4bbad21'],
}),
('cubature', '2.0.4', {
'update_config_guess': True,
'checksums': ['d97ce5eaac5e43910208e8274ddf6ff4f974d05688f0247ebccd807e24c2fe4a'],
}),
('DEoptimR', '1.0-8', {
Expand Down Expand Up @@ -2093,9 +2100,6 @@ exts_list = [
('asnipe', '1.1.12', {
'checksums': ['3a1f166f1c71b5877a2acca1384ec6c9b430b67af67ef26125f2abbb53c66206'],
}),
('liquidSVM', '1.2.4', {
edmondac marked this conversation as resolved.
Show resolved Hide resolved
'checksums': ['15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba'],
}),
('oddsratio', '2.0.0', {
'checksums': ['89bf3c68a6ded6a98f4ee8d487c29605ad00ac5f8db9b8bf1a52144e65332553'],
}),
Expand Down
12 changes: 8 additions & 4 deletions easybuild/easyconfigs/r/R/R-3.6.2-fosscuda-2019b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ toolchain = {'name': 'fosscuda', 'version': '2019b'}

source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s']
sources = [SOURCE_TAR_GZ]
checksums = ['bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954']
patches = [
'%(name)s-%(version)s_base_ppc64le.patch',
]
checksums = [
'bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954', # R-3.6.2.tar.gz
'905b632f391bf0ccc9f326c54914a03dfb9eb3ef7bc6865e7fd5c2f2eb733f93', # R-3.6.2_base_ppc64le.patch
]

builddependencies = [
('pkg-config', '0.29.2'),
Expand Down Expand Up @@ -244,6 +250,7 @@ exts_list = [
'checksums': ['faa25754b757fe483b876f5d07b73f76f69a1baa971420892fadec4af4bbad21'],
}),
('cubature', '2.0.4', {
'update_config_guess': True,
'checksums': ['d97ce5eaac5e43910208e8274ddf6ff4f974d05688f0247ebccd807e24c2fe4a'],
}),
('DEoptimR', '1.0-8', {
Expand Down Expand Up @@ -2094,9 +2101,6 @@ exts_list = [
('asnipe', '1.1.12', {
'checksums': ['3a1f166f1c71b5877a2acca1384ec6c9b430b67af67ef26125f2abbb53c66206'],
}),
('liquidSVM', '1.2.4', {
'checksums': ['15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba'],
}),
('oddsratio', '2.0.0', {
'checksums': ['89bf3c68a6ded6a98f4ee8d487c29605ad00ac5f8db9b8bf1a52144e65332553'],
}),
Expand Down
19 changes: 19 additions & 0 deletions easybuild/easyconfigs/r/R/R-3.6.2_base_ppc64le.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Index: src/main/arithmetic.c
===================================================================
--- src/main/arithmetic.c (Revision 77583)
+++ src/main/arithmetic.c (Arbeitskopie)
@@ -176,8 +176,14 @@
#endif
}

+
#if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
+# ifdef __PPC64__
+ // PowerPC 64 (when gcc has -mlong-double-128) breaks here ...
+# define q_1_eps (1 / LDBL_EPSILON)
+# else
static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;
+# endif
#else
static double q_1_eps = 1 / DBL_EPSILON;
#endif