From 2320f6b1cfe69a640099df2267474346bdcd28d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Brunk?= Date: Mon, 29 Jan 2024 22:11:53 +0100 Subject: [PATCH] Update to JavaCPP 1.5.10 stable and update device types --- build.sbt | 4 ++-- core/src/main/scala/torch/Device.scala | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 9f8f388d..7bae4bce 100644 --- a/build.sbt +++ b/build.sbt @@ -26,10 +26,10 @@ ThisBuild / apiURL := Some(new URL("https://storch.dev/api/")) val scrImageVersion = "4.0.34" val pytorchVersion = "2.1.2" val cudaVersion = "12.3-8.9" -val openblasVersion = "0.3.25" +val openblasVersion = "0.3.26" val mklVersion = "2024.0" ThisBuild / scalaVersion := "3.3.1" -ThisBuild / javaCppVersion := "1.5.10-SNAPSHOT" +ThisBuild / javaCppVersion := "1.5.10" ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) diff --git a/core/src/main/scala/torch/Device.scala b/core/src/main/scala/torch/Device.scala index 533b3969..b61f3467 100644 --- a/core/src/main/scala/torch/Device.scala +++ b/core/src/main/scala/torch/Device.scala @@ -20,9 +20,8 @@ import org.bytedeco.pytorch import scala.collection.immutable.ArraySeq enum DeviceType: - case CPU, CUDA, MKLDNN, OPENGL, OPENCL, IDEEP, HIP, FPGA, ORT, XLA, Vulkan, Metal, XPU, MLC, Meta, - HPU, VE, Lazy, - COMPILE_TIME_MAX_DEVICE_TYPES + case CPU, CUDA, MKLDNN, OPENGL, OPENCL, IDEEP, HIP, FPGA, ORT, XLA, Vulkan, Metal, XPU, MPS, Meta, + HPU, VE, Lazy, IPU, MTIA, PrivateUse1, COMPILE_TIME_MAX_DEVICE_TYPES object DeviceType: val deviceTypesLowerCase: Seq[String] =