From 80f5f4f8f70d7e4ca492548de5dca7c626723390 Mon Sep 17 00:00:00 2001 From: Siddharth Venkatesan Date: Tue, 20 Dec 2022 14:02:59 -0800 Subject: [PATCH] [audio] aarch64 support for audio extension --- extensions/audio/build.gradle | 10 ++++++---- .../test/java/ai/djl/audio/FFmpegAudioFactoryTest.java | 2 -- .../ai/djl/audio/processor/AudioProcessorTest.java | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/extensions/audio/build.gradle b/extensions/audio/build.gradle index 4cadf47b9ff..8b3346772f0 100644 --- a/extensions/audio/build.gradle +++ b/extensions/audio/build.gradle @@ -3,7 +3,7 @@ group 'ai.djl.audio' dependencies { api project(":api") api project(":basicdataset") - api ("org.bytedeco:javacv:1.5.7") { + api ("org.bytedeco:javacv:1.5.8") { exclude group: "org.bytedeco", module: "opencv" exclude group: "org.bytedeco", module: "openblas" exclude group: "org.bytedeco", module: "flycapture" @@ -21,9 +21,11 @@ dependencies { } api "com.github.wendykierp:JTransforms:3.1" - runtimeOnly "org.bytedeco:ffmpeg:5.0-1.5.7:macosx-x86_64" - runtimeOnly "org.bytedeco:ffmpeg:5.0-1.5.7:linux-x86_64" - runtimeOnly "org.bytedeco:ffmpeg:5.0-1.5.7:windows-x86_64" + runtimeOnly "org.bytedeco:ffmpeg:5.1.2-1.5.8:macosx-x86_64" + runtimeOnly "org.bytedeco:ffmpeg:5.1.2-1.5.8:linux-x86_64" + runtimeOnly "org.bytedeco:ffmpeg:5.1.2-1.5.8:windows-x86_64" + runtimeOnly "org.bytedeco:ffmpeg:5.1.2-1.5.8:macosx-arm64" + runtimeOnly "org.bytedeco:ffmpeg:5.1.2-1.5.8:linux-arm64" testImplementation project(":testing") testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_slf4j_version}" diff --git a/extensions/audio/src/test/java/ai/djl/audio/FFmpegAudioFactoryTest.java b/extensions/audio/src/test/java/ai/djl/audio/FFmpegAudioFactoryTest.java index 4539fedd7e5..7cfe2ca6398 100644 --- a/extensions/audio/src/test/java/ai/djl/audio/FFmpegAudioFactoryTest.java +++ b/extensions/audio/src/test/java/ai/djl/audio/FFmpegAudioFactoryTest.java @@ -17,7 +17,6 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; -import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; import org.testng.Assert; @@ -33,7 +32,6 @@ public class FFmpegAudioFactoryTest { @BeforeClass public void setUp() throws IOException { - TestRequirements.notArm(); DownloadUtils.download(URL, "build/test/test_01.wav"); } diff --git a/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java b/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java index df9fa801f76..02c31aab50a 100644 --- a/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java +++ b/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java @@ -19,7 +19,6 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; -import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; import org.testng.Assert; @@ -36,7 +35,6 @@ public class AudioProcessorTest { @BeforeClass public void setUp() throws IOException { - TestRequirements.notArm(); DownloadUtils.download(URL, "build/test/test_01.wav"); }