From 312bc9d39aaab143526889e53ae956cc52d2efb3 Mon Sep 17 00:00:00 2001 From: Tal Ben-Nun Date: Sat, 29 Jul 2023 15:57:12 -0700 Subject: [PATCH 1/2] Fix CMake search for unzipper (#2276) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b45cb6d2b2..3d2d760443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -470,7 +470,7 @@ endif() function(unpack_db db_bzip2_file) set(KERNELS_DIR "${CMAKE_SOURCE_DIR}/src/kernels") STRING(REPLACE ".bz2" "" db_file "${db_bzip2_file}") - find_program(UNZIPPER lbunzip2 bunzip2) + find_program(UNZIPPER NAMES lbunzip2 bunzip2) if(EXISTS "${db_file}") message(STATUS "WARNING: ${db_file} already exists and will be overwritten") endif() From a84ad363a4cd02987883c059487c6068edf66978 Mon Sep 17 00:00:00 2001 From: carlushuang Date: Wed, 2 Aug 2023 11:51:43 +0800 Subject: [PATCH 2/2] Fix missing DetectRocm() in FindSolutionsImpl() where options = nullptr (#2288) --- src/problem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/problem.cpp b/src/problem.cpp index d3e6c6285a..85fcd7e5c7 100644 --- a/src/problem.cpp +++ b/src/problem.cpp @@ -258,7 +258,9 @@ std::vector Problem::FindSolutionsImpl(Handle& handle, } else { - const auto workspace_max = conv_desc.GetWorkSpaceSize({&handle}, conv_problem); + auto tmp_ctx = ExecutionContext{&handle}; + tmp_ctx.DetectRocm(); + const auto workspace_max = conv_desc.GetWorkSpaceSize(tmp_ctx, conv_problem); workspace_size = std::min(options.workspace_limit, workspace_max); owned_workspace = workspace_size != 0 ? handle.Create(workspace_size) : nullptr; workspace = owned_workspace.get();