Skip to content

Commit ea65453

Browse files
authored
Delete CLBlast patch and update the tag to include the changes (arrayfire#2991)
* Fix failure with git apply after make clean After the clean target is run, the patch on CLBlast is applied again. this fails because the patch has already been applied. In order to fix this we need to reset to the original tag and apply again. * Delete CLBlast patch and update the tag to include the changes Windows was failing with the previous commit. I updated the tag to the changes pradeep pushed upstream and deleted the patch
1 parent e15f587 commit ea65453

2 files changed

Lines changed: 2 additions & 48 deletions

File tree

‎CMakeModules/build_CLBlast.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ find_program(GIT git)
1212
set(prefix ${PROJECT_BINARY_DIR}/third_party/CLBlast)
1313
set(CLBlast_location ${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}clblast${CMAKE_STATIC_LIBRARY_SUFFIX})
1414

15-
set(CLBLAST_PATCH_COMMAND ${GIT} apply --whitespace=fix ${ArrayFire_SOURCE_DIR}/CMakeModules/clblast_program_getIR.patch)
16-
1715
if(WIN32 AND CMAKE_GENERATOR_PLATFORM AND NOT CMAKE_GENERATOR MATCHES "Ninja")
1816
set(extproj_gen_opts "-G${CMAKE_GENERATOR}" "-A${CMAKE_GENERATOR_PLATFORM}")
1917
else()
@@ -29,11 +27,11 @@ endif()
2927
ExternalProject_Add(
3028
CLBlast-ext
3129
GIT_REPOSITORY https://github.com/cnugteren/CLBlast.git
32-
GIT_TAG 1.5.1
30+
GIT_TAG 41f344d1a6f2d149bba02a6615292e99b50f4856
3331
PREFIX "${prefix}"
3432
INSTALL_DIR "${prefix}"
3533
UPDATE_COMMAND ""
36-
PATCH_COMMAND "${CLBLAST_PATCH_COMMAND}"
34+
PATCH_COMMAND ""
3735
BUILD_BYPRODUCTS ${CLBlast_location}
3836
CONFIGURE_COMMAND ${CMAKE_COMMAND} ${extproj_gen_opts}
3937
-Wno-dev <SOURCE_DIR>

‎CMakeModules/clblast_program_getIR.patch‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)