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

Jump to bottom

libtorch-bin: 2.0.0 -> 2.2.2 #2

Closed
wants to merge 1 commit into from
Closed

libtorch-bin: 2.0.0 -> 2.2.2 #2

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
9 changes: 6 additions & 3 deletions pkgs/development/libraries/science/math/libtorch/bin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ let
# this derivation. However, we should ensure on version bumps
# that the CUDA toolkit for `passthru.tests` is still
# up-to-date.
version = "2.0.0";
version = "2.2.2";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib;
libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib;
Copy link
Author

Choose a reason for hiding this comment

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

Fix.

Copy link

Choose a reason for hiding this comment

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

Thx!

in stdenv.mkDerivation {
inherit version;
pname = "libtorch";
Expand Down Expand Up @@ -99,6 +99,9 @@ in stdenv.mkDerivation {
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
license = licenses.bsd3;
maintainers = with maintainers; [ junjihashimoto ];
platforms = platforms.unix;
platforms = with platforms; [
Copy link
Author

Choose a reason for hiding this comment

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

I also fixed platforms list to avoid CI errors.

"aarch64-darwin"
"x86_64-darwin" "x86_64-linux"
];
};
}
27 changes: 16 additions & 11 deletions pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
version : builtins.getAttr version {
"2.0.0" = {
version: builtins.getAttr version {
"2.2.2" = {
aarch64-darwin-cpu = {
name = "libtorch-macos-arm64-2.2.2.zip";
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.2.2.zip";
hash = "sha256-zXviMxGW0wpJDIbb++qaJLL8OwJPuT38KqRRXkEFGeA=";
};
x86_64-darwin-cpu = {
name = "libtorch-macos-2.0.0.zip";
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-2.0.0.zip";
hash = "sha256-u6y5IeYoiOC0yQ/k6JCChDs9lXWccLxUorgR8L62lkM=";
name = "libtorch-macos-x86_64-2.2.2.zip";
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-x86_64-2.2.2.zip";
hash = "sha256-GcMf+0Cwfz6D8FC5bhtxCdBC4NgysO+2xA7EqXeb2fk=";
};
x86_64-linux-cpu = {
name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cpu.zip";
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcpu.zip";
hash = "sha256-BoZQ2MC1CDVVGfX3SHC3mEpLGWO8XK7AcLcHJXDsXuc=";
name = "libtorch-cxx11-abi-shared-with-deps-2.2.2-cpu.zip";
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.2.2%2Bcpu.zip";
hash = "sha256-REVmlpMC9xGHfKXtPbw1wOzhNf+G0wNRJBwmwen8fLE=";
};
x86_64-linux-cuda = {
name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cu118.zip";
url = "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcu118.zip";
hash = "sha256-Dpw9kQdA1NI9EOT7JBKwQP4wZT6lizcnKKTQ8WVJCZc=";
name = "libtorch-cxx11-abi-shared-with-deps-2.2.2-cu121.zip";
url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.2.2%2Bcu121.zip";
hash = "sha256-UO5sz4tTQrWrnrjlWiwt1khdmGeSNRU9L5h7i/Ez+tk=";
};
};
}
5 changes: 3 additions & 2 deletions pkgs/development/libraries/science/math/libtorch/prefetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ set -eou pipefail
version=$1

bucket="https://download.pytorch.org/libtorch"
CUDA_VERSION=cu116
CUDA_VERSION=cu121

url_and_key_list=(
"x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip"
"aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip"
"x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip"
"x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip"
"x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip"
)
Expand Down