Commit a12cf646 authored by Chris Coughlin's avatar Chris Coughlin

Switched to new Aparapi effort

parent cc4bff96
......@@ -41,7 +41,7 @@
<dependency>
<groupId>com.github.haifengl</groupId>
<artifactId>smile-core</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>com.github</groupId>
......@@ -54,14 +54,14 @@
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amd</groupId>
<groupId>com.aparapi</groupId>
<artifactId>aparapi</artifactId>
<version>1.0.0</version>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-tiff</artifactId>
<version>3.2.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
......@@ -76,27 +76,27 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.6</version>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.0.2</version>
<version>4.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.6</version>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
<version>20160212</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.7</version>
<version>2.8.0</version>
</dependency>
</dependencies>
......
/*
* com.emphysic.myriad.core.experimental.aparapi.OCLConvolutionOperation
*
* Copyright (c) 2016 Emphysic LLC.
* Copyright (c) 2017 Emphysic LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -18,8 +18,9 @@
package com.emphysic.myriad.core.experimental.aparapi;
import com.amd.aparapi.Range;
import com.amd.aparapi.device.Device;
import com.aparapi.Range;
import com.aparapi.device.Device;
import com.aparapi.internal.kernel.KernelManager;
import com.emphysic.myriad.core.data.io.Dataset;
import com.emphysic.myriad.core.data.ops.ConvolutionOperation;
import com.emphysic.myriad.core.experimental.aparapi.kernels.ConvolutionKernel;
......@@ -67,7 +68,7 @@ public class OCLConvolutionOperation extends ConvolutionOperation {
if (input == null) {
return null;
}
Device best = Device.best();
Device best = KernelManager.instance().bestDevice();
if (best == null) {
ConvolutionOperation fallBack = new ConvolutionOperation(kernel);
return fallBack.run(input);
......
/*
* com.emphysic.myriad.core.experimental.aparapi.kernels.ConvolutionKernel
*
* Copyright (c) 2016 Emphysic LLC.
* Copyright (c) 2017 Emphysic LLC.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -18,7 +18,7 @@
package com.emphysic.myriad.core.experimental.aparapi.kernels;
import com.amd.aparapi.Kernel;
import com.aparapi.Kernel;
/**
* ConvolutionKernel - Aparapi kernel for performing convolution operations.
......
......@@ -20,10 +20,4 @@ The Myriad POM project files assume that they have been added to the local repos
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amd</groupId>
<artifactId>aparapi</artifactId>
<version>1.0.0</version>
</dependency>
Alternatively, you can use the scripts installdeps.bat (Windows) or installdeps.sh (Bash) to do this automatically.
\ No newline at end of file
......@@ -17,7 +17,6 @@ if not defined FOUND (
echo.
REM Run mvn install for each dep
call:mvnInstall aparapi.jar com.amd aparapi
call:mvnInstall pixelmed.jar com.pixelmed dicomtoolkit
call:mvnInstall sgdtk-0.1.1.jar com.github sgdtk
......
......@@ -14,7 +14,6 @@ then
# Check for maven
command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found; please add to PATH"; exit 1; }
# Run mvn install for each dep
mvnInstall aparapi.jar com.amd aparapi
mvnInstall pixelmed.jar com.pixelmed dicomtoolkit
mvnInstall sgdtk-0.1.1.jar com.github sgdtk
else
......
......@@ -32,72 +32,72 @@
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-agent_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence-tck_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.11</artifactId>
<version>2.4.8</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster-metrics_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster-sharding_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster-tools_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_2.11</artifactId>
<version>2.4.12</version>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>com.emphysic.myriad</groupId>
<artifactId>core</artifactId>
<version>1.0-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -38,7 +38,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.10</version>
<version>1.16.16</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<version>3.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......@@ -72,12 +72,12 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<version>3.0.3</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.3</version>
<version>1.2.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment