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

set default blas num threads to Sys.CPU_THREADS / 2 in absence of OPENBLAS_NUM_THREADS #45412

Merged
merged 5 commits into from
May 22, 2022
Merged

set default blas num threads to Sys.CPU_THREADS / 2 in absence of OPENBLAS_NUM_THREADS #45412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2802e96
cap default blas num threads to 8 again
SamuraiAku May 21, 2022
ae66ed9
Revert "cap default blas num threads to 8 again"
Moelf May 21, 2022
16f72db
cap default blas num threads to 8 again
Moelf May 21, 2022
673cde9
update
Moelf May 21, 2022
635ebfa
update
Moelf May 21, 2022
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
Prev Previous commit
Next Next commit
Revert "cap default blas num threads to 8 again" 
This reverts commit 2802e96.
  • Loading branch information
@Moelf
Moelf committed May 21, 2022
commit ae66ed9737e686274ec94bb0d3e6fcb2945d2f57
61 changes: 22 additions & 39 deletions julia.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,29 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"name": "julia-spdx",
"documentNamespace": "https://julialang.org/spdxdocs/julia-spdx-156599cd-b5aa-442c-a0d4-72ed73a46d16",
"documentNamespace": "https://julialang.org/spdxdocs/julia-spdx-dfcfa3b6-fcb6-4ad1-99e0-deb7bec44bee",
"creationInfo": {
"creators": [
"Organization: julialang.org ()",
"Person: Simon Avery ()"
"Organization: julialang.org ()",
"Person: Simon Avery ()"
],
"created": "2022-05-19T06:17:33Z"
"created": "2022-02-16T11:46:38Z"
},
"documentDescribes": [
"SPDXRef-JuliaMain"
],
"packages": [
{
"name": "Julia",
"SPDXID": "SPDXRef-JuliaMain",
"versionInfo": "1.9.0-DEV",
"versionInfo": "1.8.0-DEV",
"packageFileName": "./",
"downloadLocation": "git+https://github.com/JuliaLang/julia.git@v1.9.0-DEV",
"downloadLocation": "git+https://github.com/JuliaLang/julia.git@v1.8.0-DEV",
"filesAnalyzed": false,
"homepage": "https://julialang.org",
"licenseConcluded": "MIT",
"licenseDeclared": "MIT",
"copyrightText": "Copyright (c) 2009-2022: Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors: https://github.com/JuliaLang/julia/contributors",
"copyrightText": "Copyright (c) 2009-2021: Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors: https://github.com/JuliaLang/julia/contributors",
"summary": "Julia is a high-level, high-performance dynamic language for technical computing.",
"comment": "In addition to the source code described by this package, Julia pulls in code from many other respositories, which are also described in this document. See relationships for details."
},
Expand Down Expand Up @@ -146,18 +149,6 @@
"copyrightText": "Copyright (c) 2014: Elliot Saba",
"summary": "A performant, 100% native-julia SHA1, SHA2, and SHA3 implementation"
},
{
"name": "DelimitedFiles.jl",
"SPDXID": "SPDXRef-JuliaDelimitedFiles",
"downloadLocation": "git+https://github.com/JuliaData/DelimitedFiles.jl.git",
"filesAnalyzed": false,
"homepage": "https://julialang.org",
"sourceInfo": "The git hash of the version in use can be found in the file stdlib/DelimitedFiles.version",
"licenseConcluded": "MIT",
"licenseDeclared": "MIT",
"copyrightText": "Copyright (c) 2012-2022 The Julia Programming Language",
"summary": "A package for reading and writing files with delimited values."
},
{
"name": "dSFMT",
"SPDXID": "SPDXRef-dSFMT",
Expand Down Expand Up @@ -435,24 +426,22 @@
"name": "libwhich",
"SPDXID": "SPDXRef-libwhich",
"downloadLocation": "git+https://github.com/vtjnash/libwhich.git",
"sourceInfo": "The git hash of the version in use can be found in the file stdlib/libwhich.version",
"filesAnalyzed": false,
"homepage": "https://github.com/vtjnash/libwhich",
"sourceInfo": "The git hash of the version in use can be found in the file stdlib/libwhich.version",
"licenseConcluded": "MIT",
"licenseDeclared": "MIT",
"copyrightText": "Copyright (c) 2017 Jameson Nash",
"summary": "Like `which`, for dynamic libraries",
"comment": "LIBWHICH is not part of the Julia binary. It is a tool used as part of building the binary, a bit like a compiler. Julia chooses to build the tool from source during the build process as a convienence."
}
],
"hasExtractedLicensingInfos": [
{
"licenseId": "LicenseRef-GPL-2.0-only-with-libgit2-exception",
"extractedText": "Note that the only valid version of the GPL as far as this project is concerned is _this_ particular version of the license (ie v2, not v2.2 or v3.x or whatever), unless explicitly otherwise stated.\n----------------------------------------------------------------------\nIn addition to the permissions in the GNU General Public License, the authors give you unlimited permission to link the compiled version of this library into combinations with other programs, and to distribute those combinations without any restriction coming from the use of this file. (The General Public License restrictions do apply in other respects; for example, they cover modification of the file, and distribution when not linked into a combined executable.)\n----------------------------------------------------------------------\nGNU GENERAL PUBLIC LICENSE\nVersion 2, June 1991\n\nCopyright (C) 1989, 1991 Free Software Foundation, Inc.\n59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\nEveryone is permitted to copy and distribute verbatim copies\nof this license document, but changing it is not allowed.\n... [more text]",
"name": "GPL-2.0-only-with-libgit2-exception"
}
],
"relationships": [
{
"spdxElementId": "SPDXRef-DOCUMENT",
"relationshipType": "DESCRIBES",
"relatedSpdxElement": "SPDXRef-JuliaMain"
},
{
"spdxElementId": "SPDXRef-JuliaPkg",
"relationshipType": "BUILD_DEPENDENCY_OF",
Expand Down Expand Up @@ -493,21 +482,11 @@
"relationshipType": "BUILD_DEPENDENCY_OF",
"relatedSpdxElement": "SPDXRef-JuliaMain"
},
{
"spdxElementId": "SPDXRef-JuliaSparseArrays",
"relationshipType": "BUILD_DEPENDENCY_OF",
"relatedSpdxElement": "SPDXRef-JuliaMain"
},
{
"spdxElementId": "SPDXRef-JuliaSHA",
"relationshipType": "BUILD_DEPENDENCY_OF",
"relatedSpdxElement": "SPDXRef-JuliaMain"
},
{
"spdxElementId": "SPDXRef-JuliaDelimitedFiles",
"relationshipType": "BUILD_DEPENDENCY_OF",
"relatedSpdxElement": "SPDXRef-JuliaMain"
},
{
"spdxElementId": "SPDXRef-dSFMT",
"relationshipType": "BUILD_DEPENDENCY_OF",
Expand Down Expand Up @@ -624,7 +603,11 @@
"relatedSpdxElement": "SPDXRef-JuliaMain"
}
],
"documentDescribes": [
"SPDXRef-JuliaMain"
"hasExtractedLicensingInfos": [
{
"licenseId": "LicenseRef-GPL-2.0-only-with-libgit2-exception",
"extractedText": "Note that the only valid version of the GPL as far as this project is concerned is _this_ particular version of the license (ie v2, not v2.2 or v3.x or whatever), unless explicitly otherwise stated.\n----------------------------------------------------------------------\nIn addition to the permissions in the GNU General Public License, the authors give you unlimited permission to link the compiled version of this library into combinations with other programs, and to distribute those combinations without any restriction coming from the use of this file. (The General Public License restrictions do apply in other respects; for example, they cover modification of the file, and distribution when not linked into a combined executable.)\n----------------------------------------------------------------------\nGNU GENERAL PUBLIC LICENSE\nVersion 2, June 1991\n\nCopyright (C) 1989, 1991 Free Software Foundation, Inc.\n59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\nEveryone is permitted to copy and distribute verbatim copies\nof this license document, but changing it is not allowed.\n... [more text]",
"name": "GPL-2.0-only-with-libgit2-exception"
}
]
}
3 changes: 0 additions & 3 deletions stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ function __init__()
if !haskey(ENV, "OPENBLAS_MAIN_FREE")
ENV["OPENBLAS_MAIN_FREE"] = "1"
end
if !haskey(ENV, "OPENBLAS_NUM_THREADS")
ENV["OPENBLAS_NUM_THREADS"] = 8
end

global libopenblas_handle = dlopen(libopenblas)
global libopenblas_path = dlpath(libopenblas_handle)
Expand Down