diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 8ce90c5f0ae5..29574c239696 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -5,14 +5,12 @@ , rocm-cmake , hip , openmp -, gtest ? null +, gtest , buildTests ? false , buildExamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] }: -assert buildTests -> gtest != null; - # Several tests seem to either not compile or have a race condition # Undefined reference to symbol '_ZTIN7testing4TestE' # Try removing this next update diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index 7874f13c6de8..9d451d866cdc 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -9,15 +9,12 @@ , rocm-comgr , rocprim , hip -, gtest ? null -, gbenchmark ? null +, gtest +, gbenchmark , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> gbenchmark != null; - # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 4eec6f354b2a..a2f580c0e027 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -11,12 +11,10 @@ , hip , gfortran , git -, gtest ? null +, gtest , buildTests ? false }: -assert buildTests -> gtest != null; - # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix index 58015654796e..5685817d47ce 100644 --- a/pkgs/development/libraries/miopen/default.nix +++ b/pkgs/development/libraries/miopen/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchurl , writeScript , pkg-config , cmake @@ -21,12 +22,11 @@ , boost , sqlite , bzip2 -, texlive ? null -, doxygen ? null -, sphinx ? null -, python3Packages ? null -, zlib ? null -, fetchurl ? null +, texlive +, doxygen +, sphinx +, zlib +, python3Packages , buildDocs ? true , buildTests ? false # LFS isn't working, so we will manually fetch these @@ -36,13 +36,6 @@ , useOpenCL ? false }: -assert buildDocs -> texlive != null; -assert buildDocs -> doxygen != null; -assert buildDocs -> sphinx != null; -assert buildDocs -> python3Packages != null; -assert buildTests -> zlib != null; -assert fetchKDBs -> fetchurl != null; - let latex = lib.optionalAttrs buildDocs texlive.combine { inherit (texlive) scheme-small diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 7b2b5ff6f404..e2d2c8769d80 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -6,22 +6,16 @@ , rocm-cmake , rocm-opencl-runtime , clang -, texlive ? null -, doxygen ? null -, sphinx ? null -, python3Packages ? null -, openblas ? null +, texlive +, doxygen +, sphinx +, openblas +, python3Packages , buildDocs ? true , buildTests ? false , buildBenchmarks ? false }: -assert buildDocs -> texlive != null; -assert buildDocs -> doxygen != null; -assert buildDocs -> sphinx != null; -assert buildDocs -> python3Packages != null; -assert buildTests -> openblas != null; - let latex = lib.optionalAttrs buildDocs texlive.combine { inherit (texlive) scheme-small diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index f6b8671ac5d5..ad32aeab5364 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -10,12 +10,10 @@ , rocm-smi , hip , gtest -, chrpath ? null +, chrpath , buildTests ? false }: -assert buildTests -> chrpath != null; - stdenv.mkDerivation (finalAttrs: { pname = "rccl"; repoVersion = "2.12.10"; diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index 6664f8b1a770..5db9c83f4206 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -10,13 +10,13 @@ , rocm-comgr , hip , python3 -, tensile ? null -, msgpack ? null -, libxml2 ? null -, llvm ? null -, python3Packages ? null -, gtest ? null -, gfortran ? null +, tensile +, msgpack +, libxml2 +, llvm +, gtest +, gfortran +, python3Packages , buildTensile ? true , buildTests ? false , buildBenchmarks ? false @@ -28,14 +28,6 @@ , gpuTargets ? [ "all" ] }: -assert buildTensile -> tensile != null; -assert buildTensile -> msgpack != null; -assert buildTensile -> libxml2 != null; -assert buildTensile -> llvm != null; -assert buildTensile -> python3Packages != null; -assert buildTests -> gtest != null; -assert buildTests -> gfortran != null; - # Tests and benchmarks are a can of worms that I will tackle in a different PR # It involves completely rewriting the amd-blis derivation assert buildTests == false; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 9f97356fe711..d9ba6df7d614 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -10,21 +10,15 @@ , hip , sqlite , python3 -, gtest ? null -, boost ? null -, fftw ? null -, fftwFloat ? null -, llvmPackages ? null +, gtest +, boost +, fftw +, fftwFloat +, llvmPackages , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> fftw != null; -assert buildBenchmarks -> fftwFloat != null; -assert (buildTests || buildBenchmarks) -> boost != null; -assert (buildTests || buildBenchmarks) -> llvmPackages != null; - stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; repoVersion = "1.0.18"; diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index f59955f67160..1a4387365f1d 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -8,15 +8,12 @@ , rocm-device-libs , rocm-comgr , hip -, gtest ? null -, gbenchmark ? null +, gtest +, gbenchmark , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> gbenchmark != null; - stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; repoVersion = "2.11.1"; diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index cc3dbebd224b..706f32ab3613 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -8,15 +8,12 @@ , rocm-device-libs , rocm-comgr , hip -, gtest ? null -, gbenchmark ? null +, gtest +, gbenchmark , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; -assert buildBenchmarks -> gbenchmark != null; - stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; repoVersion = "2.10.15"; diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 0f0ce977b1d2..d2dad1dd8859 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -12,17 +12,13 @@ , hip , gfortran , git -, gtest ? null -, boost ? null -, python3Packages ? null +, gtest +, boost +, python3Packages , buildTests ? false , buildBenchmarks ? false # Seems to depend on tests }: -assert (buildTests || buildBenchmarks) -> gtest != null; -assert (buildTests || buildBenchmarks) -> boost != null; -assert (buildTests || buildBenchmarks) -> python3Packages != null; - stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; repoVersion = "2.3.2"; diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 02a7b086e7db..fa72e0619758 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -9,13 +9,11 @@ , rocm-comgr , rocprim , hip -, gtest ? null +, gtest , buildTests ? false , buildBenchmarks ? false }: -assert buildTests -> gtest != null; - # Doesn't seem to work, thousands of errors compiling with no clear fix # Is this an upstream issue? We don't seem to be missing dependencies assert buildTests == false; diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix index 8e66f9cf1327..61f23f6bca34 100644 --- a/pkgs/development/libraries/rocwmma/default.nix +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -6,25 +6,18 @@ , rocm-cmake , hip , openmp -, gtest ? null -, rocblas ? null -, texlive ? null -, doxygen ? null -, sphinx ? null -, python3Packages ? null +, gtest +, rocblas +, texlive +, doxygen +, sphinx +, python3Packages , buildDocs ? true , buildTests ? false , buildSamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] }: -assert buildTests -> gtest != null; -assert buildTests -> rocblas != null; -assert buildDocs -> texlive != null; -assert buildDocs -> doxygen != null; -assert buildDocs -> sphinx != null; -assert buildDocs -> python3Packages != null; - # Building tests isn't working for now # undefined reference to symbol '_ZTIN7testing4TestE' assert buildTests == false;