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

rocmPackages_6: fix builds by using python311 #324235

Closed
wants to merge 1 commit into from
Closed

rocmPackages_6: fix builds by using python311 #324235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pkgs/development/rocm-modules/6/clr/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
, libGL
, libxml2
, libX11
, python3Packages
, python311Packages
}:

let
Expand Down Expand Up @@ -65,8 +65,8 @@ in stdenv.mkDerivation (finalAttrs: {
makeWrapper
cmake'
perl
python3Packages.python
python3Packages.cppheaderparser
python311Packages.python
python311Packages.cppheaderparser
];

buildInputs = [
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/rocm-modules/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, symlinkJoin
, fetchFromGitHub
, cudaPackages
, python3Packages
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend to overwrite python3Packages with python311Packages in this file, instead of every other file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend to overwrite python3Packages with python311Packages in this file, instead of every other file.

I was thinking about it, but it turned out to be a bit harder then running a sed command, because there is no newScope in this file.. I'm open to suggestions though.

, python311Packages
, elfutils
, boost179
, opencv
Expand Down Expand Up @@ -34,7 +34,7 @@ in rec {
stdenv = llvm.rocmClangStdenv;
};

rocm-smi = python3Packages.callPackage ./rocm-smi {
rocm-smi = python311Packages.callPackage ./rocm-smi {
inherit rocmUpdateScript;
stdenv = llvm.rocmClangStdenv;
};
Expand Down Expand Up @@ -77,7 +77,7 @@ in rec {
# stdenv = llvm.rocmClangStdenv;
};

rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { inherit stdenv; };
rocm-docs-core = python311Packages.callPackage ./rocm-docs-core { inherit stdenv; };

hip-common = callPackage ./hip-common {
inherit rocmUpdateScript;
Expand Down Expand Up @@ -187,7 +187,7 @@ in rec {
stdenv = llvm.rocmClangStdenv;
};

tensile = python3Packages.callPackage ./tensile {
tensile = python311Packages.callPackage ./tensile {
inherit rocmUpdateScript rocminfo;
stdenv = llvm.rocmClangStdenv;
};
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/rocm-modules/6/llvm/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
, mpfr
, zlib
, ncurses
, python3Packages
, python311Packages
, buildDocs ? true
, buildMan ? true
, buildTests ? true
Expand Down Expand Up @@ -86,11 +86,11 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
ninja
git
python3Packages.python
python311Packages.python
] ++ lib.optionals (buildDocs || buildMan) [
doxygen
sphinx
python3Packages.recommonmark
python311Packages.recommonmark
] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [
lit
] ++ extraNativeBuildInputs;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/rocm-modules/6/llvm/stage-3/flang.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, clang-unwrapped
, mlir
, graphviz
, python3Packages
, python311Packages
}:

callPackage ../base.nix rec {
Expand All @@ -14,7 +14,7 @@ callPackage ../base.nix rec {

extraNativeBuildInputs = [
graphviz
python3Packages.sphinx-markdown-tables
python311Packages.sphinx-markdown-tables
];

extraBuildInputs = [ mlir ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/rocm-modules/6/llvm/stage-3/lldb.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
, lua5_3
, graphviz
, gtest
, python3Packages
, python311Packages
}:

callPackage ../base.nix rec {
inherit stdenv rocmUpdateScript;
buildTests = false; # FIXME: Bad pathing for clang executable in tests, using relative path most likely
targetName = "lldb";
targetDir = targetName;
extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ];
extraNativeBuildInputs = [ python311Packages.sphinx-automodapi ];

extraBuildInputs = [
xz
Expand Down
12 changes: 6 additions & 6 deletions pkgs/development/rocm-modules/6/migraphx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
, sphinx
, docutils
, ghostscript
, python3Packages
, python311Packages
, buildDocs ? false
, buildTests ? false
, gpuTargets ? clr.gpuTargets
Expand Down Expand Up @@ -71,15 +71,15 @@ in stdenv.mkDerivation (finalAttrs: {
rocm-cmake
clr
clang-tools-extra
python3Packages.python
python311Packages.python
] ++ lib.optionals buildDocs [
latex
doxygen
sphinx
docutils
ghostscript
python3Packages.sphinx-rtd-theme
python3Packages.breathe
python311Packages.sphinx-rtd-theme
python311Packages.breathe
];

buildInputs = [
Expand All @@ -96,8 +96,8 @@ in stdenv.mkDerivation (finalAttrs: {
oneDNN_2
blaze
cppcheck
python3Packages.pybind11
python3Packages.onnx
python311Packages.pybind11
python311Packages.onnx
];

cmakeFlags = [
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/rocm-modules/6/miopen/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
, gtest
, rocm-comgr
, roctracer
, python3Packages
, python311Packages
, buildDocs ? false # Needs internet because of rocm-docs-core
, buildTests ? false
}:
Expand Down Expand Up @@ -156,9 +156,9 @@ in stdenv.mkDerivation (finalAttrs: {
doxygen
sphinx
rocm-docs-core
python3Packages.sphinx-rtd-theme
python3Packages.breathe
python3Packages.myst-parser
python311Packages.sphinx-rtd-theme
python311Packages.breathe
python311Packages.myst-parser
] ++ lib.optionals buildTests [
gtest
zlib
Expand Down
12 changes: 6 additions & 6 deletions pkgs/development/rocm-modules/6/mivisionx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
, lmdb
, rapidjson
, rocm-docs-core
, python3Packages
, python311Packages
, useOpenCL ? false
, useCPU ? false
, buildDocs ? false # Needs internet
Expand Down Expand Up @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
] ++ lib.optionals buildDocs [
rocm-docs-core
python3Packages.python
python311Packages.python
];

buildInputs = [
Expand All @@ -75,9 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
libjpeg_turbo
lmdb
rapidjson
python3Packages.pybind11
python3Packages.numpy
python3Packages.torchWithRocm
python311Packages.pybind11
python311Packages.numpy
python311Packages.torchWithRocm
];

cmakeFlags = [
Expand Down Expand Up @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
'';

postBuild = lib.optionalString buildDocs ''
python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
python311 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html
'';

postInstall = lib.optionalString (!useOpenCL && !useCPU) ''
Expand Down
14 changes: 7 additions & 7 deletions pkgs/development/rocm-modules/6/rocblas/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
, cmake
, rocm-cmake
, clr
, python3
, python311
, tensile
, msgpack
, libxml2
, gtest
, gfortran
, openmp
, amd-blis
, python3Packages
, python311Packages
, buildTensile ? true
, buildTests ? false
, buildBenchmarks ? false
Expand Down Expand Up @@ -68,26 +68,26 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = [
python3
python311
] ++ lib.optionals buildTensile [
msgpack
libxml2
python3Packages.msgpack
python3Packages.joblib
python311Packages.msgpack
python311Packages.joblib
] ++ lib.optionals buildTests [
gtest
] ++ lib.optionals (buildTests || buildBenchmarks) [
gfortran
openmp
amd-blis
] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [
python3Packages.pyyaml
python311Packages.pyyaml
];

cmakeFlags = [
(lib.cmakeFeature "CMAKE_C_COMPILER" "hipcc")
(lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
(lib.cmakeFeature "python" "python3")
(lib.cmakeFeature "python" "python311")
(lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets))
(lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile)
(lib.cmakeBool "ROCM_SYMLINK_LIBS" false)
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/rocm-modules/6/rocfft/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, rocmUpdateScript
, cmake
, clr
, python3
, python311
, rocm-cmake
, sqlite
, boost
Expand All @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
clr
python3
python311
rocm-cmake
];

Expand Down Expand Up @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
finalAttrs.finalPackage
openmp
(python3.withPackages (ps: with ps; [
(python311.withPackages (ps: with ps; [
pandas
scipy
]))
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/rocm-modules/6/rocgdb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
, ncurses
, expat
, rocdbgapi
, python3
, python311
, babeltrace
, sourceHighlight
}:
Expand Down Expand Up @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
ncurses
expat
rocdbgapi
python3
python311
babeltrace
sourceHighlight
];
Expand All @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-iconv-path=${glibc.bin}"
"--enable-tui"
"--with-babeltrace"
"--with-python=python3"
"--with-python=python311"
"--with-system-zlib"
"--enable-64-bit-bfd"
"--with-gmp=${gmp.dev}"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/rocm-modules/6/rocminfo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, rocm-cmake
, rocm-runtime
, busybox
, python3
, python311
, gnugrep
# rocminfo requires that the calling user have a password and be in
# the video group. If we let rocm_agent_enumerator rely upon
Expand Down Expand Up @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = [ rocm-runtime ];
propagatedBuildInputs = [ python3 ];
propagatedBuildInputs = [ python311 ];
cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ];

prePatch = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/rocm-modules/6/rocmlir/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
, zstd
, zlib
, ncurses
, python3Packages
, python311Packages
, buildRockCompiler ? false
, buildTests ? false # `argument of type 'NoneType' is not iterable`
}:
Expand Down Expand Up @@ -53,8 +53,8 @@ in stdenv.mkDerivation (finalAttrs: {
rocm-cmake
ninja
clr
python3Packages.python
python3Packages.tomli
python311Packages.python
python311Packages.tomli
];

buildInputs = [
Expand Down
12 changes: 6 additions & 6 deletions pkgs/development/rocm-modules/6/rocprofiler/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
, mpi
, systemd
, gtest
, python3Packages
, python311Packages
, gpuTargets ? clr.gpuTargets
}:

Expand Down Expand Up @@ -73,11 +73,11 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
clang
clr
python3Packages.lxml
python3Packages.cppheaderparser
python3Packages.pyyaml
python3Packages.barectf
python3Packages.pandas
python311Packages.lxml
python311Packages.cppheaderparser
python311Packages.pyyaml
python311Packages.barectf
python311Packages.pandas
];

buildInputs = [
Expand Down
Loading