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

Jump to bottom

[build] Downgrade molten-vk version to v1.1.10 #6564

Merged
merged 3 commits into from
Nov 10, 2022
Merged

[build] Downgrade molten-vk version to v1.1.10 #6564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31f464
[build] Downgrade molten-vk version to v1.1.10
jim19930609 Nov 10, 2022
fa84bf6
Update release.yml
jim19930609 Nov 10, 2022
46b412c
Update testing.yml
jim19930609 Nov 10, 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
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ jobs:

- name: Create Python Wheel
run: |
brew install molten-vk
# Use the molten-vk v1.1.10 downloaded from taichi assets
brew uninstall molten-vk
export PATH=$(pwd)/taichi-llvm/bin/:$PATH
.github/workflows/scripts/unix-build.sh
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ jobs:
- name: Build & Install
if: needs.check_files.outputs.run_job == 'true'
run: |
brew install molten-vk
# Use the molten-vk v1.1.10 downloaded from taichi assets
brew uninstall molten-vk
.github/workflows/scripts/unix-build.sh
env:
CXX: clang++
Expand Down
17 changes: 12 additions & 5 deletions cmake/TaichiCore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,19 @@ endif()
if (TI_WITH_VULKAN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTI_WITH_VULKAN")
if (APPLE)
find_library(MOLTEN_VK libMoltenVK.dylib PATHS $HOMEBREW_CELLAR/molten-vk $VULKAN_SDK REQUIRED)
configure_file(${MOLTEN_VK} ${CMAKE_BINARY_DIR}/libMoltenVK.dylib COPYONLY)
message(STATUS "MoltenVK library ${MOLTEN_VK}")
if (EXISTS ${CMAKE_BINARY_DIR}/libMoltenVK.dylib)
install(FILES ${CMAKE_BINARY_DIR}/libMoltenVK.dylib DESTINATION ${INSTALL_LIB_DIR}/runtime)
# The latest Molten-vk v1.2.0 and v1.1.11 breaks GGUI: mpm3d_ggui.py
# So we have to manually download and install Molten-vk v1.10.0
#
# Uncomment the following lines if the mpm3d_ggui.py runs well with the latest Molten-vk
#find_library(MOLTEN_VK libMoltenVK.dylib PATHS $HOMEBREW_CELLAR/molten-vk $VULKAN_SDK REQUIRED)
#configure_file(${MOLTEN_VK} ${CMAKE_BINARY_DIR}/libMoltenVK.dylib COPYONLY)
#message(STATUS "MoltenVK library ${MOLTEN_VK}")

if(NOT EXISTS ${CMAKE_BINARY_DIR}/libMoltenVK.dylib)
execute_process(COMMAND curl -L -o ${CMAKE_BINARY_DIR}/libMoltenVK.zip https://github.com/taichi-dev/taichi_assets/files/9977436/libMoltenVK.dylib.zip)
execute_process(COMMAND tar -xf ${CMAKE_BINARY_DIR}/libMoltenVK.zip --directory ${CMAKE_BINARY_DIR})
endif()
install(FILES ${CMAKE_BINARY_DIR}/libMoltenVK.dylib DESTINATION ${INSTALL_LIB_DIR}/runtime)
endif()
add_subdirectory(taichi/rhi/vulkan)
add_subdirectory(taichi/runtime/program_impls/vulkan)
Expand Down