From 1a4bb4af52dbfc78329e7b09f53fe61eb442965a Mon Sep 17 00:00:00 2001 From: david Date: Wed, 12 Sep 2018 16:09:53 +0200 Subject: [PATCH 1/6] Julia: Add version 1.0.0 request: Peter Arndt --- julia-1.0.0-0.build.sh | 208 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100755 julia-1.0.0-0.build.sh diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh new file mode 100755 index 0000000..0d7c5ef --- /dev/null +++ b/julia-1.0.0-0.build.sh @@ -0,0 +1,208 @@ +#! /bin/bash + +PKG=julia +VERSION=1.0.0 +BUILD=0 + +#PREFIX=/pkg/$PKG-$VERSION-$BUILD +PREFIX=/dev/shm/$PKG-$VERSION-$BUILD + +set -xe +umask 022 + +BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.build.tmp +test -d $BUILD_TMPDIR && rm -rf $BUILD_TMPDIR +mkdir -p $BUILD_TMPDIR/home +export TMPDIR=$BUILD_TMPDIR +export HOME=$BUILD_TMPDIR/home + +exec $PREFIX/profile <<-EOF + PATH=$PREFIX/bin:\$PATH +EOF +. $PREFIX/profile + +export MAKEFLAGS="-j $(nproc)" + +BUILDDIR=$PREFIX/build + +mkdir -p $BUILDDIR +cd $BUILDDIR + +test -e julia-${VERSION}-full.tar.gz || wget https://github.com/JuliaLang/julia/releases/download/v${VERSION}/julia-${VERSION}-full.tar.gz +test -d julia || tar xvf julia-${VERSION}-full.tar.gz +cd julia + +patch -p1 <<'EOF' + +From 93dd6a3b0e45708b902e5b7ad459d554ce45b7ab Mon Sep 17 00:00:00 2001 +From: Donald Buczek +Date: Fri, 30 Jun 2017 14:41:53 +0200 +Subject: [PATCH 2/2] Start up OpenBLAS with 1 thread per default. + +--- + base/initdefs.jl | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/base/initdefs.jl b/base/initdefs.jl +index 20437a4..4f8f6e6 100644 +--- a/base/initdefs.jl ++++ b/base/initdefs.jl +@@ -62,9 +62,8 @@ function early_init() + # make sure OpenBLAS does not set CPU affinity (#1070, #9639) + ENV["OPENBLAS_MAIN_FREE"] = get(ENV, "OPENBLAS_MAIN_FREE", + get(ENV, "GOTOBLAS_MAIN_FREE", "1")) +- if Sys.CPU_CORES > 8 && !("OPENBLAS_NUM_THREADS" in keys(ENV)) && !("OMP_NUM_THREADS" in keys(ENV)) +- # Prevent openblas from starting too many threads, unless/until specifically requested +- ENV["OPENBLAS_NUM_THREADS"] = 8 ++ if !("OPENBLAS_NUM_THREADS" in keys(ENV)) && !("OMP_NUM_THREADS" in keys(ENV)) ++ Base.LinAlg.BLAS.set_num_threads(1) + end + end + +-- +2.4.1 + +From 36e4a82ba8714bd76828d56bde4431758af552fc Mon Sep 17 00:00:00 2001 +From: Donald Buczek +Date: Fri, 30 Jun 2017 15:44:42 +0200 +Subject: [PATCH 3/3] Remove html docs + +The building of html docs pull something not versioned from the internet +and made the build sudddenly fail. + + Building HTML documentation. + INFO: Initializing package repository /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6 + INFO: Cloning METADATA from https://github.com/JuliaLang/METADATA.jl + INFO: Updating METADATA... + INFO: Computing changes... + INFO: Cloning cache of Compat from https://github.com/JuliaLang/Compat.jl.git + INFO: Cloning cache of DocStringExtensions from https://github.com/JuliaDocs/DocStringExtensions.jl.git + INFO: Cloning cache of Documenter from https://github.com/JuliaDocs/Documenter.jl.git + INFO: Installing Compat v0.25.2 + INFO: Installing DocStringExtensions v0.3.3 + INFO: Installing Documenter v0.11.1 + INFO: No packages to install, update or remove + Documenter: setting up build directory. + Documenter: expanding markdown templates. + Documenter: building cross-references. + Documenter: running document checks. + !! Skipped doctesting. + > checking footnote links. + Documenter: populating indices. + Documenter: rendering document. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/arrow.svg'. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/documenter.js'. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/search.js'. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/highlightjs/highlight.js'. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/highlightjs/default.css'. + !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/documenter.css'. + fatal: Not a git repository (or any parent up to mount point /dev/shm) + Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). + ERROR: LoadError: failed process: Process(`git rev-parse --show-toplevel`, ProcessExited(128)) [128] + Stacktrace: + [1] pipeline_error(::Base.Process) at ./process.jl:682 + [2] read(::Cmd, ::Base.DevNullStream) at ./process.jl:629 + [3] readstring at ./process.jl:634 [inlined] (repeats 2 times) + [4] readchomp at ./io.jl:491 [inlined] + [5] (::Documenter.Utilities.##2#3)() at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Utilities/Utilities.jl:423 + [6] cd(::Documenter.Utilities.##2#3, ::String) at ./file.jl:70 + [7] url(::String, ::String) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Utilities/Utilities.jl:422 + [8] render_article(::Documenter.Writers.HTMLWriter.HTMLContext, ::Documenter.Documents.NavNode) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:403 + [9] render_page(::Documenter.Writers.HTMLWriter.HTMLContext, ::Documenter.Documents.NavNode) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:170 + [10] render(::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:118 + [11] dispatch(::Type{Documenter.Writers.FormatSelector}, ::Symbol, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Selectors.jl:164 + [12] render(::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/Writers.jl:66 + [13] runner(::Type{Documenter.Builder.RenderDocument}, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Builder.jl:205 + [14] dispatch(::Type{Documenter.Builder.DocumentPipeline}, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Selectors.jl:164 + [15] cd(::Documenter.##2#3{Documenter.Documents.Document}, ::String) at ./file.jl:70 + [16] #makedocs#1(::Bool, ::Array{Any,1}, ::Function) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Documenter.jl:198 + [17] (::Documenter.#kw##makedocs)(::Array{Any,1}, ::Documenter.#makedocs) at ./:0 + [18] include_from_node1(::String) at ./loading.jl:569 + [19] include(::String) at ./sysimg.jl:14 + [20] process_options(::Base.JLOptions) at ./client.jl:305 + [21] _start() at ./client.jl:371 + while loading /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/make.jl, in expression starting on line 118 + Makefile:33: recipe for target 'html' failed + make[2]: *** [html] Error 1 + make[2]: Leaving directory '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc' + Makefile:119: recipe for target 'docs' failed + make[1]: *** [docs] Error 2 + make[1]: Leaving directory '/dev/shm/bee-root/julia/julia-0.6.0-0/source' + Makefile:59: recipe for target '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/index.html' failed + make: *** [/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/index.html] Error 2 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 9dfbf52..e0f3f0f 100644 +--- a/Makefile ++++ b/Makefile +@@ -332,7 +332,7 @@ define stringreplace + $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" + endef + +-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html ++install: $(build_depsbindir)/stringreplace + @$(MAKE) $(QUIET_MAKE) all + @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ + mkdir -p $(DESTDIR)$$subdir; \ +-- +2.4.1 +EOF + +patch -p1 <<'EOF' +From 44d590277454035841803083f57af1b861192595 Mon Sep 17 00:00:00 2001 +From: Donald Buczek +Date: Fri, 30 Jun 2017 11:41:41 +0200 +Subject: [PATCH 1/2] Allow OpenBLAS NUM_THREADS to be overwritten +When building OpenBLAS we have some default for its NUM_THREADS build +option. Allow this default to be overwritten by a new +OPENBLAS_NUM_THREADS make variable. +--- + deps/blas.mk | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) +diff --git a/deps/blas.mk b/deps/blas.mk +index 55216c8..b9bf8ed 100644 +--- a/deps/blas.mk ++++ b/deps/blas.mk +@@ -14,17 +14,18 @@ OPENBLAS_BUILD_OPTS += GEMM_MULTITHREADING_THRESHOLD=50 + ifneq ($(ARCH),x86_64) + # Assume we can't address much memory to spawn many threads + # It is also unlikely that 32-bit architectures have too many cores +-OPENBLAS_BUILD_OPTS += NUM_THREADS=8 ++OPENBLAS_NUM_THREADS:=8 + else ifeq ($(OS),WINNT) + # Windows seems unable to handle very many +-OPENBLAS_BUILD_OPTS += NUM_THREADS=16 ++OPENBLAS_NUM_THREADS:=16 + else ifeq ($(OS),Darwin) + # This should suffice for the largest macs +-OPENBLAS_BUILD_OPTS += NUM_THREADS=16 ++OPENBLAS_NUM_THREADS:=16 + else + # On linux, try to provision for the largest possible machine currently +-OPENBLAS_BUILD_OPTS += NUM_THREADS=16 ++OPENBLAS_NUM_THREADS:=16 + endif ++OPENBLAS_BUILD_OPTS += NUM_THREADS=$(OPENBLAS_NUM_THREADS) + else + OPENBLAS_BUILD_OPTS += USE_THREAD=0 + endif +-- +2.4.1 +--- + +make -j $(nproc) prefix="${PREFIX}" MARCH=x86-64 OPENBLAS_NUM_THREADS=80 +make install prefix=${PREFIX} MARCH=x86-64 + +patchelf --remove-rpath ${PREFIX}/lib/julia/libpcre2-posix.so.1.0.1 + +for i in `ls ${PREFIX}/bin`; do + ln -sv ${PREFIX}/bin/$i{,-$VERSION} +done + +exit From 2efe11687d1a700fb6de6c56c4f28cc1a1ec7ebf Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Sep 2018 14:59:42 +0200 Subject: [PATCH 2/6] julia: remove patch source code removed from file --- julia-1.0.0-0.build.sh | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh index 0d7c5ef..784fd7a 100755 --- a/julia-1.0.0-0.build.sh +++ b/julia-1.0.0-0.build.sh @@ -37,33 +37,6 @@ cd julia patch -p1 <<'EOF' -From 93dd6a3b0e45708b902e5b7ad459d554ce45b7ab Mon Sep 17 00:00:00 2001 -From: Donald Buczek -Date: Fri, 30 Jun 2017 14:41:53 +0200 -Subject: [PATCH 2/2] Start up OpenBLAS with 1 thread per default. - ---- - base/initdefs.jl | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/base/initdefs.jl b/base/initdefs.jl -index 20437a4..4f8f6e6 100644 ---- a/base/initdefs.jl -+++ b/base/initdefs.jl -@@ -62,9 +62,8 @@ function early_init() - # make sure OpenBLAS does not set CPU affinity (#1070, #9639) - ENV["OPENBLAS_MAIN_FREE"] = get(ENV, "OPENBLAS_MAIN_FREE", - get(ENV, "GOTOBLAS_MAIN_FREE", "1")) -- if Sys.CPU_CORES > 8 && !("OPENBLAS_NUM_THREADS" in keys(ENV)) && !("OMP_NUM_THREADS" in keys(ENV)) -- # Prevent openblas from starting too many threads, unless/until specifically requested -- ENV["OPENBLAS_NUM_THREADS"] = 8 -+ if !("OPENBLAS_NUM_THREADS" in keys(ENV)) && !("OMP_NUM_THREADS" in keys(ENV)) -+ Base.LinAlg.BLAS.set_num_threads(1) - end - end - --- -2.4.1 From 36e4a82ba8714bd76828d56bde4431758af552fc Mon Sep 17 00:00:00 2001 From: Donald Buczek From 5837d2b35ab78397ccb7399dad7a55d8dabc54ba Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Sep 2018 15:00:39 +0200 Subject: [PATCH 3/6] julia: remove patch no longer needed and not working --- julia-1.0.0-0.build.sh | 91 ------------------------------------------ 1 file changed, 91 deletions(-) diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh index 784fd7a..2831667 100755 --- a/julia-1.0.0-0.build.sh +++ b/julia-1.0.0-0.build.sh @@ -35,97 +35,6 @@ test -e julia-${VERSION}-full.tar.gz || wget https://github.com/JuliaLang/julia/ test -d julia || tar xvf julia-${VERSION}-full.tar.gz cd julia -patch -p1 <<'EOF' - - -From 36e4a82ba8714bd76828d56bde4431758af552fc Mon Sep 17 00:00:00 2001 -From: Donald Buczek -Date: Fri, 30 Jun 2017 15:44:42 +0200 -Subject: [PATCH 3/3] Remove html docs - -The building of html docs pull something not versioned from the internet -and made the build sudddenly fail. - - Building HTML documentation. - INFO: Initializing package repository /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6 - INFO: Cloning METADATA from https://github.com/JuliaLang/METADATA.jl - INFO: Updating METADATA... - INFO: Computing changes... - INFO: Cloning cache of Compat from https://github.com/JuliaLang/Compat.jl.git - INFO: Cloning cache of DocStringExtensions from https://github.com/JuliaDocs/DocStringExtensions.jl.git - INFO: Cloning cache of Documenter from https://github.com/JuliaDocs/Documenter.jl.git - INFO: Installing Compat v0.25.2 - INFO: Installing DocStringExtensions v0.3.3 - INFO: Installing Documenter v0.11.1 - INFO: No packages to install, update or remove - Documenter: setting up build directory. - Documenter: expanding markdown templates. - Documenter: building cross-references. - Documenter: running document checks. - !! Skipped doctesting. - > checking footnote links. - Documenter: populating indices. - Documenter: rendering document. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/arrow.svg'. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/documenter.js'. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/search.js'. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/highlightjs/highlight.js'. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/highlightjs/default.css'. - !! Overwriting '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/assets/documenter.css'. - fatal: Not a git repository (or any parent up to mount point /dev/shm) - Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). - ERROR: LoadError: failed process: Process(`git rev-parse --show-toplevel`, ProcessExited(128)) [128] - Stacktrace: - [1] pipeline_error(::Base.Process) at ./process.jl:682 - [2] read(::Cmd, ::Base.DevNullStream) at ./process.jl:629 - [3] readstring at ./process.jl:634 [inlined] (repeats 2 times) - [4] readchomp at ./io.jl:491 [inlined] - [5] (::Documenter.Utilities.##2#3)() at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Utilities/Utilities.jl:423 - [6] cd(::Documenter.Utilities.##2#3, ::String) at ./file.jl:70 - [7] url(::String, ::String) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Utilities/Utilities.jl:422 - [8] render_article(::Documenter.Writers.HTMLWriter.HTMLContext, ::Documenter.Documents.NavNode) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:403 - [9] render_page(::Documenter.Writers.HTMLWriter.HTMLContext, ::Documenter.Documents.NavNode) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:170 - [10] render(::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/HTMLWriter.jl:118 - [11] dispatch(::Type{Documenter.Writers.FormatSelector}, ::Symbol, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Selectors.jl:164 - [12] render(::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Writers/Writers.jl:66 - [13] runner(::Type{Documenter.Builder.RenderDocument}, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Builder.jl:205 - [14] dispatch(::Type{Documenter.Builder.DocumentPipeline}, ::Documenter.Documents.Document) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Selectors.jl:164 - [15] cd(::Documenter.##2#3{Documenter.Documents.Document}, ::String) at ./file.jl:70 - [16] #makedocs#1(::Bool, ::Array{Any,1}, ::Function) at /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/deps/v0.6/Documenter/src/Documenter.jl:198 - [17] (::Documenter.#kw##makedocs)(::Array{Any,1}, ::Documenter.#makedocs) at ./:0 - [18] include_from_node1(::String) at ./loading.jl:569 - [19] include(::String) at ./sysimg.jl:14 - [20] process_options(::Base.JLOptions) at ./client.jl:305 - [21] _start() at ./client.jl:371 - while loading /dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/make.jl, in expression starting on line 118 - Makefile:33: recipe for target 'html' failed - make[2]: *** [html] Error 1 - make[2]: Leaving directory '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc' - Makefile:119: recipe for target 'docs' failed - make[1]: *** [docs] Error 2 - make[1]: Leaving directory '/dev/shm/bee-root/julia/julia-0.6.0-0/source' - Makefile:59: recipe for target '/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/index.html' failed - make: *** [/dev/shm/bee-root/julia/julia-0.6.0-0/source/doc/_build/html/en/index.html] Error 2 ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9dfbf52..e0f3f0f 100644 ---- a/Makefile -+++ b/Makefile -@@ -332,7 +332,7 @@ define stringreplace - $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" - endef - --install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html -+install: $(build_depsbindir)/stringreplace - @$(MAKE) $(QUIET_MAKE) all - @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ - mkdir -p $(DESTDIR)$$subdir; \ --- -2.4.1 -EOF patch -p1 <<'EOF' From 44d590277454035841803083f57af1b861192595 Mon Sep 17 00:00:00 2001 From 3e13d106ba28c8ae8884b27ea18ad2fd92234316 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 18 Sep 2018 17:12:21 +0200 Subject: [PATCH 4/6] julia: add new patch new to set the default threads to 1 --- julia-1.0.0-0.build.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh index 2831667..07067f5 100755 --- a/julia-1.0.0-0.build.sh +++ b/julia-1.0.0-0.build.sh @@ -78,6 +78,26 @@ index 55216c8..b9bf8ed 100644 2.4.1 --- +ist etwas runtergehackt +aber dadurch dass auf all unseren Servern mehr als 8 threads sind, sollte es +immer greifen +mit `OPENBLAS_NUM_THREADS=x julia` kann man es zur laufzeit erhoehen +diff --git a/base/sysimg.jl b/base/sysimg.jl +index dd605b0..ed3c7b2 100644 +--- a/base/sysimg.jl ++++ b/base/sysimg.jl +@@ -459,7 +459,7 @@ function __init__() + if !haskey(ENV, "OPENBLAS_NUM_THREADS") && !haskey(ENV, "OMP_NUM_THREADS") + cpu_threads = Sys.CPU_THREADS::Int + if cpu_threads > 8 # always at most 8 +- ENV["OPENBLAS_NUM_THREADS"] = "8" ++ ENV["OPENBLAS_NUM_THREADS"] = "1" + elseif haskey(ENV, "JULIA_CPU_THREADS") # or exactly as specified + ENV["OPENBLAS_NUM_THREADS"] = cpu_threads + end # otherwise, trust that openblas will pick CPU_THREADS anyways, without any intervention +-- +EOF + make -j $(nproc) prefix="${PREFIX}" MARCH=x86-64 OPENBLAS_NUM_THREADS=80 make install prefix=${PREFIX} MARCH=x86-64 From 7a5ecff16a9a05da09d1fef3a700a5b49ac65133 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Sep 2018 15:02:55 +0200 Subject: [PATCH 5/6] julia: not need anymore will not be installed. The lib stays in builddir --- julia-1.0.0-0.build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh index 07067f5..ce020ee 100755 --- a/julia-1.0.0-0.build.sh +++ b/julia-1.0.0-0.build.sh @@ -98,11 +98,10 @@ index dd605b0..ed3c7b2 100644 -- EOF + make -j $(nproc) prefix="${PREFIX}" MARCH=x86-64 OPENBLAS_NUM_THREADS=80 make install prefix=${PREFIX} MARCH=x86-64 -patchelf --remove-rpath ${PREFIX}/lib/julia/libpcre2-posix.so.1.0.1 - for i in `ls ${PREFIX}/bin`; do ln -sv ${PREFIX}/bin/$i{,-$VERSION} done From 2d04162648975c169b1e479e3f0c7c5d16ac92ee Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Sep 2018 16:28:44 +0200 Subject: [PATCH 6/6] julia: julia-debug copy for julia-debug and his shared libs --- julia-1.0.0-0.build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/julia-1.0.0-0.build.sh b/julia-1.0.0-0.build.sh index ce020ee..31426c8 100755 --- a/julia-1.0.0-0.build.sh +++ b/julia-1.0.0-0.build.sh @@ -4,8 +4,8 @@ PKG=julia VERSION=1.0.0 BUILD=0 -#PREFIX=/pkg/$PKG-$VERSION-$BUILD -PREFIX=/dev/shm/$PKG-$VERSION-$BUILD +PREFIX=/pkg/$PKG-$VERSION-$BUILD +#PREFIX=/dev/shm/$PKG-$VERSION-$BUILD set -xe umask 022 @@ -102,6 +102,10 @@ EOF make -j $(nproc) prefix="${PREFIX}" MARCH=x86-64 OPENBLAS_NUM_THREADS=80 make install prefix=${PREFIX} MARCH=x86-64 +cp -av ${BUILDDIR}/julia/usr/bin/julia-debug ${PREFIX}/bin/ +cp -av ${BUILDDIR}/julia/usr/lib/libjulia-debug.so* ${PREFIX}/lib/ +cp -av ${BUILDDIR}/julia/usr/lib/julia/sys-debug.so ${PREFIX}/lib/julia/ + for i in `ls ${PREFIX}/bin`; do ln -sv ${PREFIX}/bin/$i{,-$VERSION} done