Merge branch 'develop' into ea_replace_problem_description_with_conv_…

…problem_description_part_3_2
ROCm · Aug 2, 2023 · 5c857ea · 5c857ea
2 parents 5ad8da3 + a84ad36
commit 5c857ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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()

diff --git a/src/problem.cpp b/src/problem.cpp
@@ -258,7 +258,9 @@ std::vector<Solution> 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();