JuliaLang · vtjnash · Feb 26, 2021
diff --git a/Make.inc b/Make.inc
@@ -60,9 +60,25 @@ USE_SYSTEM_P7ZIP:=0
 # Link to the LLVM shared library
 USE_LLVM_SHLIB := 1
 
+## Settings for various Intel tools
+# Set to 1 to use MKL
+USE_INTEL_MKL ?= 0
+# Set to 1 to use Intel LIBM
+USE_INTEL_LIBM ?= 0
+# Set to 1 to enable profiling with Intel VTune Amplifier
+USE_INTEL_JITEVENTS ?= 0
+# Set to 1 to use Intel C, C++, and FORTRAN compilers
+USEICC  ?= 0
+USEIFC  ?= 0
+
 # Enable threading with one thread
 JULIA_THREADS := 1
 
+ifeq ($(USE_MKL), 1)
+$(warning "The julia make variable USE_MKL has been renamed to USE_INTEL_MKL")
+USE_INTEL_MKL := 1
+endif
+
 # Set to 1 to enable profiling with OProfile
 USE_OPROFILE_JITEVENTS ?= 0
 
@@ -1052,7 +1068,11 @@ endif
 # Use ILP64 BLAS interface when building openblas from source on 64-bit architectures
 ifeq ($(BINARY), 64)
 ifeq ($(USE_SYSTEM_BLAS), 1)
+ifeq ($(USE_INTEL_MKL), 1)
+USE_BLAS64 ?= 1
+else # non MKL system blas is most likely LP64
 USE_BLAS64 ?= 0
+endif
 else
 USE_BLAS64 ?= 1
 endif
@@ -1148,7 +1168,7 @@ BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SP
 BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
 
 # This is the set of projects that BinaryBuilder dependencies are hooked up for.
-BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
+BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
 define SET_BB_DEFAULT
 # First, check to see if BB is disabled on a global setting
 ifeq ($$(USE_BINARYBUILDER),0)
@@ -1312,13 +1332,63 @@ ifeq ($(USE_PERF_JITEVENTS), 1)
 JCPPFLAGS += -DJL_USE_PERF_JITEVENTS
 endif
 
+
+# Intel libraries
+
+ifeq ($(USE_INTEL_LIBM), 1)
+USE_SYSTEM_LIBM := 1
+LIBM := -L$(MKLROOT)/../compiler/lib/intel64 -limf
+LIBMNAME := libimf
+endif
+
+ifeq ($(USE_INTEL_MKL), 1)
+ifeq ($(USE_BLAS64), 1)
+export MKL_INTERFACE_LAYER := ILP64
+MKLLIB := $(MKLROOT)/lib/intel64
+else
+MKLLIB := $(MKLROOT)/lib/ia32
+endif
+USE_SYSTEM_BLAS:=1
+USE_SYSTEM_LAPACK:=1
+LIBBLASNAME := libmkl_rt
+LIBLAPACKNAME := libmkl_rt
+MKL_LDFLAGS := -L$(MKLLIB) -lmkl_rt
+ifneq ($(strip $(MKLLIB)),)
+  ifeq ($(OS), Linux)
+    RPATH_MKL := -Wl,-rpath,$(MKLLIB)
+    RPATH     += $(RPATH_MKL)
+    MKL_LDFLAGS += $(RPATH_MKL)
+  endif
+endif
+LIBBLAS   := $(MKL_LDFLAGS)
+LIBLAPACK := $(MKL_LDFLAGS)
+endif
+
 ifeq ($(HAVE_SSP),1)
 JCPPFLAGS += -DHAVE_SSP=1
 ifeq ($(USEGCC),1)
 OSLIBS += -lssp
 endif
 endif
 
+# ATLAS
+
+# ATLAS must have been previously  installed to usr/lib/libatlas
+# (built as a shared library, for your platform, single threaded)
+USE_ATLAS := 0
+ATLAS_LIBDIR := $(build_libdir)
+#or ATLAS_LIBDIR := /path/to/system/atlas/lib
+
+ifeq ($(USE_ATLAS), 1)
+USE_BLAS64 := 0
+USE_SYSTEM_BLAS := 1
+USE_SYSTEM_LAPACK := 1
+LIBBLAS := -L$(ATLAS_LIBDIR) -lsatlas
+LIBLAPACK := $(LIBBLAS)
+LIBBLASNAME := libsatlas
+LIBLAPACKNAME := $(LIBBLASNAME)
+endif
+
 # Renaming OpenBLAS symbols, see #4923 and #8734
 ifeq ($(USE_SYSTEM_BLAS), 0)
 ifeq ($(USE_BLAS64), 1)

diff --git a/Makefile b/Makefile
@@ -164,7 +164,7 @@ JL_TARGETS += julia-debug
 endif
 
 # private libraries, that are installed in $(prefix)/lib/julia
-JL_PRIVATE_LIBS-0 := libccalltest libllvmcalltest libjulia-internal libblastrampoline
+JL_PRIVATE_LIBS-0 := libccalltest libllvmcalltest libjulia-internal
 ifeq ($(BUNDLE_DEBUG_LIBS),1)
 JL_PRIVATE_LIBS-0 += libjulia-internal-debug
 endif
@@ -356,7 +356,7 @@ endif
 		$(call stringreplace,$${DEBUG_TARGET},sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT)); \
 	fi;
 endif
-
+	
 	# Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`.  We only need to do this for Linux/FreeBSD
 ifneq (,$(findstring $(OS),Linux FreeBSD))
 	$(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT)

diff --git a/NEWS.md b/NEWS.md
@@ -60,10 +60,6 @@ Standard library changes
 
 #### LinearAlgebra
 
-* Use [Libblastrampoline](https://github.com/staticfloat/libblastrampoline/) to pick a BLAS and LAPACK at runtime. By default it forwards to OpenBLAS in the Julia distribution. The forwarding mechanism can be used by packages to replace the BLAS and LAPACK with user preferences. ([#39455])
-* On aarch64, OpenBLAS now uses an ILP64 BLAS like all other 64-bit platforms. ([#39436])
-* OpenBLAS is updated to 0.3.13. ([#39216])
-* SuiteSparse is updated to 5.8.1. ([#39455])
 
 #### Markdown
 

diff --git a/contrib/refresh_checksums.mk b/contrib/refresh_checksums.mk
@@ -19,7 +19,7 @@ CLANG_TRIPLETS=$(filter %-darwin %-freebsd,$(TRIPLETS))
 NON_CLANG_TRIPLETS=$(filter-out %-darwin %-freebsd,$(TRIPLETS))
 
 # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
-BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib suitesparse openlibm blastrampoline
+BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib suitesparse openlibm
 BB_GCC_EXPANDED_PROJECTS=openblas csl
 BB_CXX_EXPANDED_PROJECTS=gmp llvm clang llvm-tools
 # These are non-BB source-only deps

diff --git a/deps/Makefile b/deps/Makefile
@@ -24,7 +24,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST)
 # if you are adding a new target, it can help to copy an similar, existing target
 #
 # autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl
-# custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack blastrampoline openblas utf8proc objconv libwhich
+# custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack openblas utf8proc objconv libwhich
 # CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls
 #
 # downloadable via git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2
@@ -39,9 +39,6 @@ unexport CONFIG_SITE
 
 DEP_LIBS :=
 
-# Always use libblastrampoline
-DEP_LIBS += blastrampoline
-
 ifeq ($(USE_SYSTEM_CSL), 0)
 DEP_LIBS += csl
 endif
@@ -187,7 +184,7 @@ install: $(addprefix install-, $(DEP_LIBS))
 cleanall: $(addprefix clean-, $(DEP_LIBS))
 distcleanall: $(addprefix distclean-, $(DEP_LIBS))
 	rm -rf $(build_prefix)
-getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-blastrampoline get-openblas get-lapack get-suitesparse get-unwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-nghttp2 get-curl get-libgit2 get-libwhich get-zlib get-p7zip get-csl
+getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-nghttp2 get-curl get-libgit2 get-libwhich get-zlib get-p7zip get-csl
 
 # If we're building for MacOS, no matter what, `getall` should include `llvmunwind`
 ifeq ($(OS),Darwin)
@@ -206,8 +203,7 @@ include $(SRCDIR)/pcre.mk
 include $(SRCDIR)/openlibm.mk
 include $(SRCDIR)/dsfmt.mk
 include $(SRCDIR)/objconv.mk
-include $(SRCDIR)/blastrampoline.mk
-include $(SRCDIR)/openblas.mk
+include $(SRCDIR)/blas.mk
 include $(SRCDIR)/utf8proc.mk
 include $(SRCDIR)/suitesparse.mk
 include $(SRCDIR)/unwind.mk

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -73,10 +73,6 @@ OBJCONV_VER := 2.49.1
 OBJCONV_JLL_NAME := Objconv
 OBJCONV_JLL_VER  := 2.49.1+0
 
-# blastrampoline
-BLASTRAMPOLINE_VER := 3.0.0
-BLASTRAMPOLINE_JLL_NAME := libblastrampoline
-
 # OpenBLAS
 OPENBLAS_VER := 0.3.13
 OPENBLAS_JLL_NAME := OpenBLAS
@@ -97,7 +93,7 @@ PCRE_VER := 10.36
 PCRE_JLL_NAME := PCRE2
 
 # SuiteSparse
-SUITESPARSE_VER := 5.8.1
+SUITESPARSE_VER := 5.4.0
 SUITESPARSE_JLL_NAME := SuiteSparse
 
 # unwind

diff --git a/deps/openblas.mk → deps/blas.mk b/deps/openblas.mk → deps/blas.mk
diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk
diff --git a/deps/blastrampoline.version b/deps/blastrampoline.version
diff --git a/deps/checksums/blastrampoline b/deps/checksums/blastrampoline
diff --git a/deps/suitesparse.mk b/deps/suitesparse.mk
@@ -4,12 +4,14 @@ ifeq ($(USE_BLAS64), 1)
 UMFPACK_CONFIG := -DLONGBLAS='long long'
 CHOLMOD_CONFIG := -DLONGBLAS='long long'
 SPQR_CONFIG := -DLONGBLAS='long long'
+ifeq ($(OPENBLAS_SYMBOLSUFFIX), 64_)
 UMFPACK_CONFIG += -DSUN64
 CHOLMOD_CONFIG += -DSUN64
 SPQR_CONFIG += -DSUN64
 endif
+endif
 
-# Disable linking to libmetis
+# Disable trying to link against libmetis
 CHOLMOD_CONFIG += -DNPARTITION
 
 ifneq ($(USE_BINARYBUILDER_SUITESPARSE), 1)
@@ -21,7 +23,7 @@ SUITE_SPARSE_LIB := $(LDFLAGS) -L"$(abspath $(BUILDDIR))/SuiteSparse-$(SUITESPAR
 ifeq ($(OS), Darwin)
 SUITE_SPARSE_LIB += $(RPATH_ESCAPED_ORIGIN)
 endif
-SUITESPARSE_MFLAGS := CC="$(CC)" CXX="$(CXX)" F77="$(FC)" AR="$(AR)" RANLIB="$(RANLIB)" BLAS="-L$(build_shlibdir) -lblastrampoline" LAPACK="-L$(build_shlibdir) -lblastrampoline" \
+SUITESPARSE_MFLAGS := CC="$(CC)" CXX="$(CXX)" F77="$(FC)" AR="$(AR)" RANLIB="$(RANLIB)" BLAS="$(LIBBLAS)" LAPACK="$(LIBLAPACK)" \
 	  LDFLAGS="$(SUITE_SPARSE_LIB)" CFOPENMP="" CUDA=no CUDA_PATH="" \
 	  UMFPACK_CONFIG="$(UMFPACK_CONFIG)" CHOLMOD_CONFIG="$(CHOLMOD_CONFIG)" SPQR_CONFIG="$(SPQR_CONFIG)"
 ifeq ($(OS),WINNT)
@@ -51,7 +53,11 @@ $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse-shlib.patch-applied: $(BU
 $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse-winclang.patch-applied
 $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse-shlib.patch-applied
 
-$(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/blastrampoline
+ifeq ($(USE_SYSTEM_BLAS), 0)
+$(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/openblas
+else ifeq ($(USE_SYSTEM_LAPACK), 0)
+$(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/lapack
+endif
 
 $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/source-extracted
 	$(MAKE) -C $(dir $<)SuiteSparse_config library config $(SUITESPARSE_MFLAGS)
@@ -147,6 +153,6 @@ clean-suitesparse-wrapper: clean-suitesparse
 distclean-suitesparse-wrapper: distclean-suitesparse
 install-suitesparse-wrapper: install-suitesparse
 
-# suitesparse depends on blastrampoline
-compile-suitesparse: | $(build_prefix)/manifest/blastrampoline
+# suitesparse depends on OpenBLAS
+compile-suitesparse: | $(build_prefix)/manifest/openblas
 endif
diff --git a/stdlib/Distributed/test/distributed_exec.jl b/stdlib/Distributed/test/distributed_exec.jl
@@ -1005,8 +1005,30 @@ end
 
 # Test addprocs enable_threaded_blas parameter
 
+const get_num_threads = function() # anonymous so it will be serialized when called
+    blas = LinearAlgebra.BLAS.vendor()
+    # Wrap in a try to catch unsupported blas versions
+    try
+        if blas == :openblas
+            return ccall((:openblas_get_num_threads, Base.libblas_name), Cint, ())
+        elseif blas == :openblas64
+            return ccall((:openblas_get_num_threads64_, Base.libblas_name), Cint, ())
+        elseif blas == :mkl
+            return ccall((:MKL_Get_Max_Num_Threads, Base.libblas_name), Cint, ())
+        end
+
+        # OSX BLAS looks at an environment variable
+        if Sys.isapple()
+            return tryparse(Cint, get(ENV, "VECLIB_MAXIMUM_THREADS", "1"))
+        end
+    catch
+    end
+
+    return nothing
+end
+
 function get_remote_num_threads(processes_added)
-    return [remotecall_fetch(BLAS.get_num_threads, proc_id) for proc_id in processes_added]
+    return [remotecall_fetch(get_num_threads, proc_id) for proc_id in processes_added]
 end
 
 function test_blas_config(pid, expected)
@@ -1019,7 +1041,7 @@ function test_blas_config(pid, expected)
 end
 
 function test_add_procs_threaded_blas()
-    master_blas_thread_count = BLAS.get_num_threads()
+    master_blas_thread_count = get_num_threads()
     if master_blas_thread_count === nothing
         @warn "Skipping blas num threads tests due to unsupported blas version"
         return
@@ -1033,7 +1055,7 @@ function test_add_procs_threaded_blas()
     end
 
     # Master thread should not have changed
-    @test BLAS.get_num_threads() == master_blas_thread_count
+    @test get_num_threads() == master_blas_thread_count
 
     # Threading disabled in children by default
     thread_counts_by_process = get_remote_num_threads(processes_added)
@@ -1047,9 +1069,9 @@ function test_add_procs_threaded_blas()
         test_blas_config(proc_id, true)
     end
 
-    @test BLAS.get_num_threads() == master_blas_thread_count
+    @test get_num_threads() == master_blas_thread_count
 
-    # BLAS.set_num_threads(`num`) doesn't  cause BLAS.get_num_threads to return `num`
+    # BLAS.set_num_threads(`num`) doesn't  cause get_num_threads to return `num`
     # depending on the machine, the BLAS version, and BLAS configuration, so
     # we need a very lenient test.
     thread_counts_by_process = get_remote_num_threads(processes_added)

diff --git a/stdlib/LinearAlgebra/Project.toml b/stdlib/LinearAlgebra/Project.toml
@@ -3,7 +3,6 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [deps]
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"