From 555c55de2c0d20b3d9c25cfb3e00edaa45a53d5c Mon Sep 17 00:00:00 2001
From: Mark Winter <mwinter@drexel.edu>
Date: Thu, 16 Apr 2020 19:13:54 +0200
Subject: [PATCH] Matlab binaries from new cmake build
---
src/MATLAB/+HIP/@Cuda/CheckConfig.m | 7 ++++++
src/MATLAB/+HIP/@Cuda/Closure.m | 2 +-
src/MATLAB/+HIP/@Cuda/Cuda.m | 23 ++++++++++---------
src/MATLAB/+HIP/@Cuda/DeviceCount.m | 2 +-
src/MATLAB/+HIP/@Cuda/DeviceStats.m | 2 +-
src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m | 2 +-
src/MATLAB/+HIP/@Cuda/EntropyFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/Gaussian.m | 2 +-
src/MATLAB/+HIP/@Cuda/GetMinMax.m | 2 +-
src/MATLAB/+HIP/@Cuda/HIP.mexa64 | 3 +++
src/MATLAB/+HIP/@Cuda/HIP.mexw64 | 3 +++
src/MATLAB/+HIP/@Cuda/Help.m | 2 +-
src/MATLAB/+HIP/@Cuda/HighPassFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/IdentityFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/Info.m | 2 +-
src/MATLAB/+HIP/@Cuda/LoG.m | 2 +-
src/MATLAB/+HIP/@Cuda/MaxFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/MeanFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/MedianFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/Mex.mexa64 | 3 ---
src/MATLAB/+HIP/@Cuda/Mex.mexw64 | 3 ---
src/MATLAB/+HIP/@Cuda/MinFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/MultiplySum.m | 2 +-
src/MATLAB/+HIP/@Cuda/NLMeans.m | 2 +-
src/MATLAB/+HIP/@Cuda/Opener.m | 2 +-
src/MATLAB/+HIP/@Cuda/StdFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/Sum.m | 2 +-
src/MATLAB/+HIP/@Cuda/VarFilter.m | 2 +-
src/MATLAB/+HIP/@Cuda/WienerFilter.m | 2 +-
src/MATLAB/+HIP/CheckConfig.m | 12 ++++++++++
src/MATLAB/+HIP/Closure.m | 1 -
src/MATLAB/+HIP/ElementWiseDifference.m | 1 -
src/MATLAB/+HIP/EntropyFilter.m | 1 -
src/MATLAB/+HIP/Gaussian.m | 1 -
src/MATLAB/+HIP/GetMinMax.m | 1 -
src/MATLAB/+HIP/Help.m | 1 +
src/MATLAB/+HIP/HighPassFilter.m | 1 -
src/MATLAB/+HIP/IdentityFilter.m | 1 -
src/MATLAB/+HIP/Info.m | 1 -
src/MATLAB/+HIP/LoG.m | 1 -
src/MATLAB/+HIP/MaxFilter.m | 1 -
src/MATLAB/+HIP/MeanFilter.m | 1 -
src/MATLAB/+HIP/MedianFilter.m | 1 -
src/MATLAB/+HIP/MinFilter.m | 1 -
src/MATLAB/+HIP/MinMax.m | 21 -----------------
src/MATLAB/+HIP/MultiplySum.m | 1 -
src/MATLAB/+HIP/NLMeans.m | 1 -
src/MATLAB/+HIP/Opener.m | 1 -
src/MATLAB/+HIP/StdFilter.m | 1 -
src/MATLAB/+HIP/Sum.m | 1 -
src/MATLAB/+HIP/VarFilter.m | 1 -
src/MATLAB/+HIP/WienerFilter.m | 1 -
52 files changed, 61 insertions(+), 81 deletions(-)
create mode 100644 src/MATLAB/+HIP/@Cuda/CheckConfig.m
create mode 100644 src/MATLAB/+HIP/@Cuda/HIP.mexa64
create mode 100644 src/MATLAB/+HIP/@Cuda/HIP.mexw64
delete mode 100644 src/MATLAB/+HIP/@Cuda/Mex.mexa64
delete mode 100644 src/MATLAB/+HIP/@Cuda/Mex.mexw64
create mode 100644 src/MATLAB/+HIP/CheckConfig.m
delete mode 100644 src/MATLAB/+HIP/MinMax.m
diff --git a/src/MATLAB/+HIP/@Cuda/CheckConfig.m b/src/MATLAB/+HIP/@Cuda/CheckConfig.m
new file mode 100644
index 00000000..8356f79a
--- /dev/null
+++ b/src/MATLAB/+HIP/@Cuda/CheckConfig.m
@@ -0,0 +1,7 @@
+% CheckConfig - Get Hydra library configuration information.
+% [hydraConfig] = HIP.Cuda.CheckConfig()
+% Returns hydraConfig structure with configuration information.
+%
+function [hydraConfig] = CheckConfig()
+ [hydraConfig] = HIP.Cuda.HIP('CheckConfig');
+end
diff --git a/src/MATLAB/+HIP/@Cuda/Closure.m b/src/MATLAB/+HIP/@Cuda/Closure.m
index 7c40dbb3..1f68ce99 100644
--- a/src/MATLAB/+HIP/@Cuda/Closure.m
+++ b/src/MATLAB/+HIP/@Cuda/Closure.m
@@ -18,5 +18,5 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
function [imageOut] = Closure(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('Closure',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('Closure',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Cuda.m b/src/MATLAB/+HIP/@Cuda/Cuda.m
index b9b4bf95..ff4d59c9 100644
--- a/src/MATLAB/+HIP/@Cuda/Cuda.m
+++ b/src/MATLAB/+HIP/@Cuda/Cuda.m
@@ -1,30 +1,31 @@
classdef (Abstract,Sealed) Cuda
methods (Static)
+ [imageOut] = Closure(imageIn,kernel,numIterations,device)
+ [imageOut] = HighPassFilter(imageIn,sigmas,device)
+ [numCudaDevices,memStats] = DeviceCount()
Help(command)
+ [hydraConfig] = CheckConfig()
+ [imageOut] = IdentityFilter(imageIn,device)
[cmdInfo] = Info()
- [numCudaDevices,memStats] = DeviceCount()
+ [imageOut] = Gaussian(imageIn,sigmas,numIterations,device)
+ [imageOut] = MeanFilter(imageIn,kernel,numIterations,device)
[deviceStatsArray] = DeviceStats()
[imageOut] = ElementWiseDifference(image1In,image2In,device)
+ [imageOut] = MultiplySum(imageIn,kernel,numIterations,device)
[imageOut] = EntropyFilter(imageIn,kernel,device)
- [imageOut] = HighPassFilter(imageIn,sigmas,device)
- [imageOut] = Gaussian(imageIn,sigmas,numIterations,device)
- [imageOut] = Closure(imageIn,kernel,numIterations,device)
+ [imageOut] = StdFilter(imageIn,kernel,numIterations,device)
[minVal,maxVal] = GetMinMax(imageIn,device)
- [imageOut] = WienerFilter(imageIn,kernel,noiseVariance,device)
- [imageOut] = Opener(imageIn,kernel,numIterations,device)
- [imageOut] = IdentityFilter(imageIn,device)
- [imageOut] = MultiplySum(imageIn,kernel,numIterations,device)
[imageOut] = LoG(imageIn,sigmas,device)
- [imageOut] = StdFilter(imageIn,kernel,numIterations,device)
- [imageOut] = MeanFilter(imageIn,kernel,numIterations,device)
[imageOut] = MedianFilter(imageIn,kernel,numIterations,device)
[imageOut] = MinFilter(imageIn,kernel,numIterations,device)
[imageOut] = MaxFilter(imageIn,kernel,numIterations,device)
[imageOut] = NLMeans(imageIn,h,searchWindowRadius,nhoodRadius,device)
+ [imageOut] = Opener(imageIn,kernel,numIterations,device)
[imageOut] = Sum(imageIn,device)
[imageOut] = VarFilter(imageIn,kernel,numIterations,device)
+ [imageOut] = WienerFilter(imageIn,kernel,noiseVariance,device)
end
methods (Static, Access = private)
- varargout = Mex(command, varargin)
+ varargout = HIP(command, varargin)
end
end
diff --git a/src/MATLAB/+HIP/@Cuda/DeviceCount.m b/src/MATLAB/+HIP/@Cuda/DeviceCount.m
index 26b0ace7..7ffa63b6 100644
--- a/src/MATLAB/+HIP/@Cuda/DeviceCount.m
+++ b/src/MATLAB/+HIP/@Cuda/DeviceCount.m
@@ -5,5 +5,5 @@
% The memory structure contains the total memory on the device and the memory available for a Cuda call.
%
function [numCudaDevices,memStats] = DeviceCount()
- [numCudaDevices,memStats] = HIP.Cuda.Mex('DeviceCount');
+ [numCudaDevices,memStats] = HIP.Cuda.HIP('DeviceCount');
end
diff --git a/src/MATLAB/+HIP/@Cuda/DeviceStats.m b/src/MATLAB/+HIP/@Cuda/DeviceStats.m
index 62710ca6..7f622f9f 100644
--- a/src/MATLAB/+HIP/@Cuda/DeviceStats.m
+++ b/src/MATLAB/+HIP/@Cuda/DeviceStats.m
@@ -3,5 +3,5 @@
% DeviceStatsArray -- this is an array of structs, one struct per device.
% The struct has these fields: name, major, minor, constMem, sharedMem, totalMem, tccDriver, mpCount, threadsPerMP, warpSize, maxThreads.
function [deviceStatsArray] = DeviceStats()
- [deviceStatsArray] = HIP.Cuda.Mex('DeviceStats');
+ [deviceStatsArray] = HIP.Cuda.HIP('DeviceStats');
end
diff --git a/src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m b/src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m
index 52bbcb81..6877c9a3 100644
--- a/src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m
+++ b/src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m
@@ -14,5 +14,5 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
function [imageOut] = ElementWiseDifference(image1In,image2In,device)
- [imageOut] = HIP.Cuda.Mex('ElementWiseDifference',image1In,image2In,device);
+ [imageOut] = HIP.Cuda.HIP('ElementWiseDifference',image1In,image2In,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/EntropyFilter.m b/src/MATLAB/+HIP/@Cuda/EntropyFilter.m
index e3d31ecb..3420460a 100644
--- a/src/MATLAB/+HIP/@Cuda/EntropyFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/EntropyFilter.m
@@ -15,5 +15,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = EntropyFilter(imageIn,kernel,device)
- [imageOut] = HIP.Cuda.Mex('EntropyFilter',imageIn,kernel,device);
+ [imageOut] = HIP.Cuda.HIP('EntropyFilter',imageIn,kernel,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Gaussian.m b/src/MATLAB/+HIP/@Cuda/Gaussian.m
index 92e6fa34..eac8a009 100644
--- a/src/MATLAB/+HIP/@Cuda/Gaussian.m
+++ b/src/MATLAB/+HIP/@Cuda/Gaussian.m
@@ -18,5 +18,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = Gaussian(imageIn,sigmas,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('Gaussian',imageIn,sigmas,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('Gaussian',imageIn,sigmas,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/GetMinMax.m b/src/MATLAB/+HIP/@Cuda/GetMinMax.m
index b06dd63e..e30a96af 100644
--- a/src/MATLAB/+HIP/@Cuda/GetMinMax.m
+++ b/src/MATLAB/+HIP/@Cuda/GetMinMax.m
@@ -10,5 +10,5 @@
% maxValue = This is the highest value found in the array.
%
function [minVal,maxVal] = GetMinMax(imageIn,device)
- [minVal,maxVal] = HIP.Cuda.Mex('GetMinMax',imageIn,device);
+ [minVal,maxVal] = HIP.Cuda.HIP('GetMinMax',imageIn,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/HIP.mexa64 b/src/MATLAB/+HIP/@Cuda/HIP.mexa64
new file mode 100644
index 00000000..065ff0b4
--- /dev/null
+++ b/src/MATLAB/+HIP/@Cuda/HIP.mexa64
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8837d61162969a50b76928fe415820f0f7949b69db887e802533895bbf01b2c7
+size 17397192
diff --git a/src/MATLAB/+HIP/@Cuda/HIP.mexw64 b/src/MATLAB/+HIP/@Cuda/HIP.mexw64
new file mode 100644
index 00000000..ee3c220e
--- /dev/null
+++ b/src/MATLAB/+HIP/@Cuda/HIP.mexw64
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9e9e13bd2517330614c8e54f686cfd20c98bb0ac1e917980a78963a30be19ab
+size 11271168
diff --git a/src/MATLAB/+HIP/@Cuda/Help.m b/src/MATLAB/+HIP/@Cuda/Help.m
index 2daacbdb..c1461c4d 100644
--- a/src/MATLAB/+HIP/@Cuda/Help.m
+++ b/src/MATLAB/+HIP/@Cuda/Help.m
@@ -1,5 +1,5 @@
% Help - Print detailed usage information for the specified command.
% HIP.Cuda.Help([command])
function Help(command)
- HIP.Cuda.Mex('Help',command);
+ HIP.Cuda.HIP('Help',command);
end
diff --git a/src/MATLAB/+HIP/@Cuda/HighPassFilter.m b/src/MATLAB/+HIP/@Cuda/HighPassFilter.m
index e795bae5..c915ea03 100644
--- a/src/MATLAB/+HIP/@Cuda/HighPassFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/HighPassFilter.m
@@ -14,5 +14,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = HighPassFilter(imageIn,sigmas,device)
- [imageOut] = HIP.Cuda.Mex('HighPassFilter',imageIn,sigmas,device);
+ [imageOut] = HIP.Cuda.HIP('HighPassFilter',imageIn,sigmas,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/IdentityFilter.m b/src/MATLAB/+HIP/@Cuda/IdentityFilter.m
index 79955722..544a6a1f 100644
--- a/src/MATLAB/+HIP/@Cuda/IdentityFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/IdentityFilter.m
@@ -11,5 +11,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = IdentityFilter(imageIn,device)
- [imageOut] = HIP.Cuda.Mex('IdentityFilter',imageIn,device);
+ [imageOut] = HIP.Cuda.HIP('IdentityFilter',imageIn,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Info.m b/src/MATLAB/+HIP/@Cuda/Info.m
index a59edcf5..ac892f31 100644
--- a/src/MATLAB/+HIP/@Cuda/Info.m
+++ b/src/MATLAB/+HIP/@Cuda/Info.m
@@ -7,5 +7,5 @@
% commandInfo.helpLines - Help string
%
function [cmdInfo] = Info()
- [cmdInfo] = HIP.Cuda.Mex('Info');
+ [cmdInfo] = HIP.Cuda.HIP('Info');
end
diff --git a/src/MATLAB/+HIP/@Cuda/LoG.m b/src/MATLAB/+HIP/@Cuda/LoG.m
index e0dff78f..287a70d7 100644
--- a/src/MATLAB/+HIP/@Cuda/LoG.m
+++ b/src/MATLAB/+HIP/@Cuda/LoG.m
@@ -14,5 +14,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = LoG(imageIn,sigmas,device)
- [imageOut] = HIP.Cuda.Mex('LoG',imageIn,sigmas,device);
+ [imageOut] = HIP.Cuda.HIP('LoG',imageIn,sigmas,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/MaxFilter.m b/src/MATLAB/+HIP/@Cuda/MaxFilter.m
index 077a6c3b..1665d4fa 100644
--- a/src/MATLAB/+HIP/@Cuda/MaxFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/MaxFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = MaxFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('MaxFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('MaxFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/MeanFilter.m b/src/MATLAB/+HIP/@Cuda/MeanFilter.m
index a3a00ee5..2b4fa064 100644
--- a/src/MATLAB/+HIP/@Cuda/MeanFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/MeanFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = MeanFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('MeanFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('MeanFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/MedianFilter.m b/src/MATLAB/+HIP/@Cuda/MedianFilter.m
index e7436d17..f660dfa9 100644
--- a/src/MATLAB/+HIP/@Cuda/MedianFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/MedianFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = MedianFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('MedianFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('MedianFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Mex.mexa64 b/src/MATLAB/+HIP/@Cuda/Mex.mexa64
deleted file mode 100644
index a9c42807..00000000
--- a/src/MATLAB/+HIP/@Cuda/Mex.mexa64
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7de219e7540ceb5070ae836fb719809422045588d5eaf4a9572fcecebf45519e
-size 21963056
diff --git a/src/MATLAB/+HIP/@Cuda/Mex.mexw64 b/src/MATLAB/+HIP/@Cuda/Mex.mexw64
deleted file mode 100644
index 0da92628..00000000
--- a/src/MATLAB/+HIP/@Cuda/Mex.mexw64
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89683039cc6bc06b1331d58dd4b49bf5998a6989c1ba638c746587adccde5aa1
-size 11917312
diff --git a/src/MATLAB/+HIP/@Cuda/MinFilter.m b/src/MATLAB/+HIP/@Cuda/MinFilter.m
index 5f35fb68..83a6713e 100644
--- a/src/MATLAB/+HIP/@Cuda/MinFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/MinFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = MinFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('MinFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('MinFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/MultiplySum.m b/src/MATLAB/+HIP/@Cuda/MultiplySum.m
index 2d0bc1d0..7cbef03a 100644
--- a/src/MATLAB/+HIP/@Cuda/MultiplySum.m
+++ b/src/MATLAB/+HIP/@Cuda/MultiplySum.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = MultiplySum(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('MultiplySum',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('MultiplySum',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/NLMeans.m b/src/MATLAB/+HIP/@Cuda/NLMeans.m
index f89d7f92..9cc700fe 100644
--- a/src/MATLAB/+HIP/@Cuda/NLMeans.m
+++ b/src/MATLAB/+HIP/@Cuda/NLMeans.m
@@ -11,5 +11,5 @@
% nhoodRadius = radius of patch size (comparison window).
%
function [imageOut] = NLMeans(imageIn,h,searchWindowRadius,nhoodRadius,device)
- [imageOut] = HIP.Cuda.Mex('NLMeans',imageIn,h,searchWindowRadius,nhoodRadius,device);
+ [imageOut] = HIP.Cuda.HIP('NLMeans',imageIn,h,searchWindowRadius,nhoodRadius,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Opener.m b/src/MATLAB/+HIP/@Cuda/Opener.m
index b4baee78..d04e6591 100644
--- a/src/MATLAB/+HIP/@Cuda/Opener.m
+++ b/src/MATLAB/+HIP/@Cuda/Opener.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = Opener(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('Opener',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('Opener',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/StdFilter.m b/src/MATLAB/+HIP/@Cuda/StdFilter.m
index 27f358a1..97da8807 100644
--- a/src/MATLAB/+HIP/@Cuda/StdFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/StdFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = StdFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('StdFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('StdFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/Sum.m b/src/MATLAB/+HIP/@Cuda/Sum.m
index 12a272ce..fdd69007 100644
--- a/src/MATLAB/+HIP/@Cuda/Sum.m
+++ b/src/MATLAB/+HIP/@Cuda/Sum.m
@@ -11,5 +11,5 @@
% valueOut = This is the summation of the entire array.
%
function [imageOut] = Sum(imageIn,device)
- [imageOut] = HIP.Cuda.Mex('Sum',imageIn,device);
+ [imageOut] = HIP.Cuda.HIP('Sum',imageIn,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/VarFilter.m b/src/MATLAB/+HIP/@Cuda/VarFilter.m
index 638197b0..2aeea76d 100644
--- a/src/MATLAB/+HIP/@Cuda/VarFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/VarFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = VarFilter(imageIn,kernel,numIterations,device)
- [imageOut] = HIP.Cuda.Mex('VarFilter',imageIn,kernel,numIterations,device);
+ [imageOut] = HIP.Cuda.HIP('VarFilter',imageIn,kernel,numIterations,device);
end
diff --git a/src/MATLAB/+HIP/@Cuda/WienerFilter.m b/src/MATLAB/+HIP/@Cuda/WienerFilter.m
index 1a43af96..b3f2a75a 100644
--- a/src/MATLAB/+HIP/@Cuda/WienerFilter.m
+++ b/src/MATLAB/+HIP/@Cuda/WienerFilter.m
@@ -19,5 +19,5 @@
% imageOut = This will be an array of the same type and shape as the input array.
%
function [imageOut] = WienerFilter(imageIn,kernel,noiseVariance,device)
- [imageOut] = HIP.Cuda.Mex('WienerFilter',imageIn,kernel,noiseVariance,device);
+ [imageOut] = HIP.Cuda.HIP('WienerFilter',imageIn,kernel,noiseVariance,device);
end
diff --git a/src/MATLAB/+HIP/CheckConfig.m b/src/MATLAB/+HIP/CheckConfig.m
new file mode 100644
index 00000000..ffa6c881
--- /dev/null
+++ b/src/MATLAB/+HIP/CheckConfig.m
@@ -0,0 +1,12 @@
+% CheckConfig - Get Hydra library configuration information.
+% [hydraConfig] = HIP.CheckConfig()
+% Returns hydraConfig structure with configuration information.
+%
+function [hydraConfig] = CheckConfig()
+ try
+ [hydraConfig] = HIP.Cuda.CheckConfig();
+ catch errMsg
+ warning(errMsg.message);
+ [hydraConfig] = HIP.Local.CheckConfig();
+ end
+end
diff --git a/src/MATLAB/+HIP/Closure.m b/src/MATLAB/+HIP/Closure.m
index 9e1121b7..30241d04 100644
--- a/src/MATLAB/+HIP/Closure.m
+++ b/src/MATLAB/+HIP/Closure.m
@@ -17,7 +17,6 @@
% the data across multiple devices.
%
% imageOut = This will be an array of the same type and shape as the input array.
-
function [imageOut] = Closure(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.Closure(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/ElementWiseDifference.m b/src/MATLAB/+HIP/ElementWiseDifference.m
index b09b6696..e9fc66b0 100644
--- a/src/MATLAB/+HIP/ElementWiseDifference.m
+++ b/src/MATLAB/+HIP/ElementWiseDifference.m
@@ -13,7 +13,6 @@
% the data across multiple devices.
%
% imageOut = This will be an array of the same type and shape as the input array.
-
function [imageOut] = ElementWiseDifference(image1In,image2In,device)
try
[imageOut] = HIP.Cuda.ElementWiseDifference(image1In,image2In,device);
diff --git a/src/MATLAB/+HIP/EntropyFilter.m b/src/MATLAB/+HIP/EntropyFilter.m
index 22834ce8..f3a7ec4a 100644
--- a/src/MATLAB/+HIP/EntropyFilter.m
+++ b/src/MATLAB/+HIP/EntropyFilter.m
@@ -14,7 +14,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = EntropyFilter(imageIn,kernel,device)
try
[imageOut] = HIP.Cuda.EntropyFilter(imageIn,kernel,device);
diff --git a/src/MATLAB/+HIP/Gaussian.m b/src/MATLAB/+HIP/Gaussian.m
index 9bfc841a..86dcd9e8 100644
--- a/src/MATLAB/+HIP/Gaussian.m
+++ b/src/MATLAB/+HIP/Gaussian.m
@@ -17,7 +17,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = Gaussian(imageIn,sigmas,numIterations,device)
try
[imageOut] = HIP.Cuda.Gaussian(imageIn,sigmas,numIterations,device);
diff --git a/src/MATLAB/+HIP/GetMinMax.m b/src/MATLAB/+HIP/GetMinMax.m
index 3aa37bd5..414a3374 100644
--- a/src/MATLAB/+HIP/GetMinMax.m
+++ b/src/MATLAB/+HIP/GetMinMax.m
@@ -9,7 +9,6 @@
% minValue = This is the lowest value found in the array.
% maxValue = This is the highest value found in the array.
%
-
function [minVal,maxVal] = GetMinMax(imageIn,device)
try
[minVal,maxVal] = HIP.Cuda.GetMinMax(imageIn,device);
diff --git a/src/MATLAB/+HIP/Help.m b/src/MATLAB/+HIP/Help.m
index cf717d33..8c8532d9 100644
--- a/src/MATLAB/+HIP/Help.m
+++ b/src/MATLAB/+HIP/Help.m
@@ -1,4 +1,5 @@
% Help - Print detailed usage information for the specified command.
% HIP.Help([command])
function Help(command)
+ HIP.Cuda.HIP('Help',command);
end
diff --git a/src/MATLAB/+HIP/HighPassFilter.m b/src/MATLAB/+HIP/HighPassFilter.m
index a90189ed..49b1cb39 100644
--- a/src/MATLAB/+HIP/HighPassFilter.m
+++ b/src/MATLAB/+HIP/HighPassFilter.m
@@ -13,7 +13,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = HighPassFilter(imageIn,sigmas,device)
try
[imageOut] = HIP.Cuda.HighPassFilter(imageIn,sigmas,device);
diff --git a/src/MATLAB/+HIP/IdentityFilter.m b/src/MATLAB/+HIP/IdentityFilter.m
index 12fefae6..f2ef32f4 100644
--- a/src/MATLAB/+HIP/IdentityFilter.m
+++ b/src/MATLAB/+HIP/IdentityFilter.m
@@ -10,7 +10,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = IdentityFilter(imageIn,device)
try
[imageOut] = HIP.Cuda.IdentityFilter(imageIn,device);
diff --git a/src/MATLAB/+HIP/Info.m b/src/MATLAB/+HIP/Info.m
index 8c867deb..df476a12 100644
--- a/src/MATLAB/+HIP/Info.m
+++ b/src/MATLAB/+HIP/Info.m
@@ -6,7 +6,6 @@
% commandInfo.inArgs - Comma-delimited string list of input arguments
% commandInfo.helpLines - Help string
%
-
function [cmdInfo] = Info()
try
[cmdInfo] = HIP.Cuda.Info();
diff --git a/src/MATLAB/+HIP/LoG.m b/src/MATLAB/+HIP/LoG.m
index 6cb94a63..79624c8a 100644
--- a/src/MATLAB/+HIP/LoG.m
+++ b/src/MATLAB/+HIP/LoG.m
@@ -13,7 +13,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = LoG(imageIn,sigmas,device)
try
[imageOut] = HIP.Cuda.LoG(imageIn,sigmas,device);
diff --git a/src/MATLAB/+HIP/MaxFilter.m b/src/MATLAB/+HIP/MaxFilter.m
index 320a3022..3bb149fd 100644
--- a/src/MATLAB/+HIP/MaxFilter.m
+++ b/src/MATLAB/+HIP/MaxFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = MaxFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.MaxFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/MeanFilter.m b/src/MATLAB/+HIP/MeanFilter.m
index 8b681294..8fcc9141 100644
--- a/src/MATLAB/+HIP/MeanFilter.m
+++ b/src/MATLAB/+HIP/MeanFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = MeanFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.MeanFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/MedianFilter.m b/src/MATLAB/+HIP/MedianFilter.m
index 0a12d4c2..c02ce796 100644
--- a/src/MATLAB/+HIP/MedianFilter.m
+++ b/src/MATLAB/+HIP/MedianFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = MedianFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.MedianFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/MinFilter.m b/src/MATLAB/+HIP/MinFilter.m
index 48b3ffbd..3100327e 100644
--- a/src/MATLAB/+HIP/MinFilter.m
+++ b/src/MATLAB/+HIP/MinFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = MinFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.MinFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/MinMax.m b/src/MATLAB/+HIP/MinMax.m
deleted file mode 100644
index bc3888e0..00000000
--- a/src/MATLAB/+HIP/MinMax.m
+++ /dev/null
@@ -1,21 +0,0 @@
-% MinMax - This returns the global min and max values.
-% [minOut,maxOut] = HIP.MinMax(arrayIn,[device])
-% imageIn = This is a one to five dimensional array. The first three dimensions are treated as spatial.
-% The spatial dimensions will have the kernel applied. The last two dimensions will determine
-% how to stride or jump to the next spatial block.
-%
-% device (optional) = Use this if you have multiple devices and want to select one explicitly.
-% Setting this to [] allows the algorithm to either pick the best device and/or will try to split
-% the data across multiple devices.
-%
-% minOut = This is the minimum value found in the input.
-% maxOut = This is the maximum value found in the input.
-
-function [minOut,maxOut] = MinMax(arrayIn,device)
- try
- [minOut,maxOut] = HIP.Cuda.MinMax(arrayIn,device);
- catch errMsg
- warning(errMsg.message);
- [minOut,maxOut] = HIP.Local.MinMax(arrayIn,device);
- end
-end
diff --git a/src/MATLAB/+HIP/MultiplySum.m b/src/MATLAB/+HIP/MultiplySum.m
index ab6f06ea..c946d07d 100644
--- a/src/MATLAB/+HIP/MultiplySum.m
+++ b/src/MATLAB/+HIP/MultiplySum.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = MultiplySum(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.MultiplySum(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/NLMeans.m b/src/MATLAB/+HIP/NLMeans.m
index 39cdc87d..61d53945 100644
--- a/src/MATLAB/+HIP/NLMeans.m
+++ b/src/MATLAB/+HIP/NLMeans.m
@@ -10,7 +10,6 @@
%
% nhoodRadius = radius of patch size (comparison window).
%
-
function [imageOut] = NLMeans(imageIn,h,searchWindowRadius,nhoodRadius,device)
try
[imageOut] = HIP.Cuda.NLMeans(imageIn,h,searchWindowRadius,nhoodRadius,device);
diff --git a/src/MATLAB/+HIP/Opener.m b/src/MATLAB/+HIP/Opener.m
index 21f6a5bc..e218c6df 100644
--- a/src/MATLAB/+HIP/Opener.m
+++ b/src/MATLAB/+HIP/Opener.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = Opener(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.Opener(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/StdFilter.m b/src/MATLAB/+HIP/StdFilter.m
index 2fe520c1..38656815 100644
--- a/src/MATLAB/+HIP/StdFilter.m
+++ b/src/MATLAB/+HIP/StdFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = StdFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.StdFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/Sum.m b/src/MATLAB/+HIP/Sum.m
index 68eab89b..e11dad4b 100644
--- a/src/MATLAB/+HIP/Sum.m
+++ b/src/MATLAB/+HIP/Sum.m
@@ -10,7 +10,6 @@
%
% valueOut = This is the summation of the entire array.
%
-
function [imageOut] = Sum(imageIn,device)
try
[imageOut] = HIP.Cuda.Sum(imageIn,device);
diff --git a/src/MATLAB/+HIP/VarFilter.m b/src/MATLAB/+HIP/VarFilter.m
index 1e3d642e..c8b1a01d 100644
--- a/src/MATLAB/+HIP/VarFilter.m
+++ b/src/MATLAB/+HIP/VarFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = VarFilter(imageIn,kernel,numIterations,device)
try
[imageOut] = HIP.Cuda.VarFilter(imageIn,kernel,numIterations,device);
diff --git a/src/MATLAB/+HIP/WienerFilter.m b/src/MATLAB/+HIP/WienerFilter.m
index 398311f9..b24ba9a9 100644
--- a/src/MATLAB/+HIP/WienerFilter.m
+++ b/src/MATLAB/+HIP/WienerFilter.m
@@ -18,7 +18,6 @@
%
% imageOut = This will be an array of the same type and shape as the input array.
%
-
function [imageOut] = WienerFilter(imageIn,kernel,noiseVariance,device)
try
[imageOut] = HIP.Cuda.WienerFilter(imageIn,kernel,noiseVariance,device);
--
GitLab