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

tbb 2021.11.0 #154684

Merged
merged 4 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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 Formula/o/opencascade.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class Opencascade < Formula

Check notice on line 1 in Formula/o/opencascade.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for opencascade from

:cb43e42f5c4 (Merge 501ab3ebf21cbaf36e8a3c492dc54b996af1dde1 into 6f78fe185567f1b62374225e92be837d5109c72f, 2023-11-18)

Check notice on line 1 in Formula/o/opencascade.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for opencascade from

:cb43e42f5c4 (Merge 501ab3ebf21cbaf36e8a3c492dc54b996af1dde1 into 6f78fe185567f1b62374225e92be837d5109c72f, 2023-11-18)

Check notice on line 1 in Formula/o/opencascade.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for opencascade from

:cb43e42f5c4 (Merge 501ab3ebf21cbaf36e8a3c492dc54b996af1dde1 into 6f78fe185567f1b62374225e92be837d5109c72f, 2023-11-18)

Check notice on line 1 in Formula/o/opencascade.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for opencascade from

:cb43e42f5c4 (Merge 501ab3ebf21cbaf36e8a3c492dc54b996af1dde1 into 6f78fe185567f1b62374225e92be837d5109c72f, 2023-11-18)

Check notice on line 1 in Formula/o/opencascade.rb

View workflow job for this annotation

GitHub Actions / macOS 12-x86_64

Installed previously built bottle for opencascade from

:cb43e42f5c4 (Merge 501ab3ebf21cbaf36e8a3c492dc54b996af1dde1 into 6f78fe185567f1b62374225e92be837d5109c72f, 2023-11-18)
desc "3D modeling and numerical simulation software for CAD/CAM/CAE"
homepage "https://dev.opencascade.org/"
url "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_7_2;sf=tgz"
version "7.7.2"
sha256 "2fb23c8d67a7b72061b4f7a6875861e17d412d524527b2a96151ead1d9cfa2c1"
license "LGPL-2.1-only"
revision 1
revision 2

# The first-party download page (https://dev.opencascade.org/release)
# references version 7.5.0 and hasn't been updated for later maintenance
Expand Down
27 changes: 12 additions & 15 deletions Formula/t/tbb.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Tbb < Formula

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 12-x86_64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)

Check notice on line 1 in Formula/t/tbb.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

Installed previously built bottle for tbb from

:375a060a47f (Merge 31c0a5aab86efb462007e886a483e178592cf81b into e6651d200270004ce72f8c3ef7b98b4cbfed3ae8, 2023-11-17)
desc "Rich and complete approach to parallelism in C++"
homepage "https://github.com/oneapi-src/oneTBB"
url "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz"
sha256 "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b"
url "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.11.0.tar.gz"
sha256 "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363"
license "Apache-2.0"

bottle do
Expand All @@ -18,7 +18,8 @@
end

depends_on "cmake" => :build
depends_on "python@3.11" => [:build, :test]
depends_on "python-setuptools" => :build
depends_on "python@3.12" => [:build, :test]
depends_on "swig" => :build

on_linux do
Expand All @@ -31,12 +32,12 @@
patch :DATA

def python3
"python3.11"
"python3.12"
end

def install
# Prevent `setup.py` from installing tbb4py directly into HOMEBREW_PREFIX.
# We need this due to our `python@3.11` patch.
# We need this due to our Python patch.
site_packages = Language::Python.site_packages(python3)
inreplace "python/CMakeLists.txt", "@@SITE_PACKAGES@@", site_packages

Expand Down Expand Up @@ -67,11 +68,6 @@

system python3, "-m", "pip", "install", *std_pip_args, "."
end

return unless OS.linux?

inreplace_files = prefix.glob("rml/CMakeFiles/irml.dir/{flags.make,build.make,link.txt}")
inreplace inreplace_files, Superenv.shims_path/ENV.cxx, ENV.cxx
end

test do
Expand Down Expand Up @@ -136,23 +132,24 @@

__END__
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 1d2b05f..81ba8de 100644
index 748921a5..d03fdc6f 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -40,7 +40,7 @@ add_custom_target(
${PYTHON_EXECUTABLE} ${PYTHON_BUILD_WORK_DIR}/setup.py
build -b${PYTHON_BUILD_WORK_DIR}
build_ext ${TBB4PY_INCLUDE_STRING} -L$<TARGET_FILE_DIR:TBB::tbb>
- install --prefix ${PYTHON_BUILD_WORK_DIR}/build -f
+ install --prefix ${PYTHON_BUILD_WORK_DIR}/build --install-lib ${PYTHON_BUILD_WORK_DIR}/build/@@SITE_PACKAGES@@ -f
- install --prefix build -f
+ install --prefix build --install-lib ${PYTHON_BUILD_WORK_DIR}/build/@@SITE_PACKAGES@@ -f
COMMENT "Build and install to work directory the oneTBB Python module"
)

@@ -49,7 +49,7 @@ add_test(NAME python_test
@@ -50,7 +50,7 @@ add_test(NAME python_test
-DPYTHON_MODULE_BUILD_PATH=${PYTHON_BUILD_WORK_DIR}/build
-P ${PROJECT_SOURCE_DIR}/cmake/python/test_launcher.cmake)

-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_BUILD_WORK_DIR}/build/
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_BUILD_WORK_DIR}/
DESTINATION .
COMPONENT tbb4py)

Loading