pyrox.dev / nixpkgs
lol
fork atom

python312Packages.torchWithRocm: remove find_package(rocm-core) workaround

Luna Nova 61e2c0c5 6c1a925c

+2 -9
unified split
-7
pkgs/development/python-modules/torch/source/default.nix
··· 369 substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \ 370 --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" 371 372 - # Workaround cmake error //include does not exist! in rocm-core-config.cmake 373 - # Removing the call falls back to hip_version. Can likely be removed after ROCm 6.4 bump 374 - substituteInPlace cmake/public/LoadHIP.cmake \ 375 - --replace-fail \ 376 - "find_package(rocm-core CONFIG)" \ 377 - "" 378 - 379 # Use composable kernel as dependency, rather than built-in third-party 380 substituteInPlace aten/src/ATen/CMakeLists.txt \ 381 --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include)" "" \
··· 369 substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \ 370 --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" 371 372 # Use composable kernel as dependency, rather than built-in third-party 373 substituteInPlace aten/src/ATen/CMakeLists.txt \ 374 --replace-fail "list(APPEND ATen_HIP_INCLUDE \''${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include)" "" \
+2 -2
pkgs/development/rocm-modules/6/rocm-core/default.nix
··· 56 # Test that the CMake config file can be included and sets expected vars 57 '' 58 mkdir test_project 59 - cd test_project 60 61 echo ' 62 cmake_minimum_required(VERSION 3.16) ··· 70 ' > CMakeLists.txt 71 72 CMAKE_PREFIX_PATH="$out" cmake . 73 - cd .. 74 75 . $out/nix-support/setup-hook 76 env | grep '^ROCM'
··· 56 # Test that the CMake config file can be included and sets expected vars 57 '' 58 mkdir test_project 59 + pushd test_project 60 61 echo ' 62 cmake_minimum_required(VERSION 3.16) ··· 70 ' > CMakeLists.txt 71 72 CMAKE_PREFIX_PATH="$out" cmake . 73 + popd 74 75 . $out/nix-support/setup-hook 76 env | grep '^ROCM'