8000 Support CMAKE_OSX_ARCHITECTURES by alexreinking · Pull Request #8390 · halide/Halide · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Support CMAKE_OSX_ARCHITECTURES #8390

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

Merged
merged 20 commits into from
Sep 4, 2024
Merged

Support CMAKE_OSX_ARCHITECTURES #8390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fdb2ac8
Use host information to initialize Halide_HOST_TARGET
alexreinking Aug 6, 2024
26d846c
Drop redundant uses of TARGETS argument
alexreinking Aug 6, 2024
640009a
Fix libtool validation function
alexreinking Aug 12, 2024
ffc2a8b
Simplify hannk build for CMake 3.28
alexreinking Aug 12, 2024
bf16f20
Use $<PATH:GET_PARENT_PATH,...> in PYTHONPATH
alexreinking Aug 12, 2024
7dc957e
Move _Halide_place_dll to add_halide_generator
alexreinking Aug 12, 2024
9d5f798
Make _Halide_try_load_generators take an argument
alexreinking Aug 12, 2024
dc919b4
Use -- for cmake -E env
alexreinking Aug 12, 2024
5d93ff7
Use file(CONFIGURE) to simplify _Halide_gengen_ensure
alexreinking Aug 12, 2024
6dc6844
WIP support CMAKE_OSX_ARCHITECTURES
alexreinking Aug 12, 2024
adc9ac5
Add hlpipe to generator helpers
alexreinking Aug 12, 2024
b17f8a7
WIP
alexreinking Aug 12, 2024
cc2a520
WIP
alexreinking Aug 14, 2024
8eecbba
WIP
alexreinking Aug 14, 2024
f07b4af
WIP
alexreinking Aug 14, 2024
120465a
WIP
alexreinking Aug 14, 2024
2f9c8cd
WIP
alexreinking Aug 14, 2024
8df371a
Collect all platform outs in lists
alexreinking Aug 29, 2024
d72df59
Consistently use file(CONFIGURE)
alexreinking Aug 29, 2024
3417316
Allow generating C_SOURCE as an extra output
alexreinking Aug 29, 2024
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
1 change: 0 additions & 1 deletion apps/cuda_mat_mul/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ add_halide_generator(mat_mul.generator SOURCES mat_mul_generator.cpp)

# Filters
add_halide_library(mat_mul FROM mat_mul.generator
TARGETS host
FEATURES cuda cuda_capability_50
PARAMS size=1024)

Expand Down
7 changes: 2 additions & 5 deletions apps/hannk/cmake/superbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,8 @@ set(ep_opts
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.."
BUILD_ALWAYS YES
USES_TERMINAL_CONFIGURE YES
USES_TERMINAL_BUILD YES)

if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
list(APPEND ep_opts CONFIGURE_HANDLED_BY_BUILD TRUE)
endif ()
USES_TERMINAL_BUILD YES
CONFIGURE_HANDLED_BY_BUILD TRUE)

##
# Define host and target builds
Expand Down
8 changes: 3 additions & 5 deletions cmake/BundleStatic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ function(_bundle_static_check_output VAR)
set("${VAR}" "${${VAR}}" PARENT_SCOPE)
endfunction()

function(_bundle_static_is_apple_libtool result item)
function(_bundle_static_is_apple_libtool result_var item)
_bundle_static_check_output(version_info "${item}" -V)
if (version_info MATCHES "Apple, Inc.")
set(result 1 PARENT_SCOPE)
else ()
set(result 0 PARENT_SCOPE)
if (NOT version_info MATCHES "Apple, Inc.")
set(${result_var} 0 PARENT_SCOPE)
Comment on lines -25 to +28
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a drive-by fix.

endif ()
endfunction()

Expand Down
Loading
Loading
0