Skip to content
Snippets Groups Projects
Commit b1b8b943 authored by Mark Winter's avatar Mark Winter
Browse files

Renamed WrapCmds to ScriptCmds

parent 1df86889
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 312 deletions
src/c/Cuda/CWrapperAutogen.cu
+ 1
− 1
View file @ b1b8b943
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
// Autogenerate all stub calls to cuda backends // Autogenerate all stub calls to cuda backends
#define GENERATE_PROC_STUBS #define GENERATE_PROC_STUBS
#include "../WrapCmds/GenCommands.h" #include "ScriptCmds/GenCommands.h"
#undef GENERATE_PROC_STUBS #undef GENERATE_PROC_STUBS
src/c/Cuda/CWrapperAutogen.h
+ 3
− 3
View file @ b1b8b943
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#endif #endif
#include "../WrapCmds/ScriptioMaps.h" #include "ScriptCmds/ScriptioMaps.h"
#include "../WrapCmds/LinkageTraitTfms.h" #include "ScriptCmds/LinkageTraitTfms.h"
#define GENERATE_PROC_STUB_PROTOTYPES #define GENERATE_PROC_STUB_PROTOTYPES
#include "../WrapCmds/GenCommands.h" #include "ScriptCmds/GenCommands.h"
#undef GENERATE_PROC_STUB_PROTOTYPES #undef GENERATE_PROC_STUB_PROTOTYPES
src/c/CudaMex.vcxproj
+ 1
− 1
View file @ b1b8b943
...@@ -100,7 +100,7 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command> ...@@ -100,7 +100,7 @@ copy $(OutDir)CudaMex.dll "$(ProjectDir)Mex.mexw64"</Command>
<ClInclude Include="Mex\MexWrapDef.h" /> <ClInclude Include="Mex\MexWrapDef.h" />
<ClInclude Include="Mex\MexKernel.h" /> <ClInclude Include="Mex\MexKernel.h" />
<ClInclude Include="WrapCmds\CommandList.h" /> <ClInclude Include="WrapCmds\CommandList.h" />
<ClInclude Include="WrapCmds\ScriptHelpers.h" /> <ClInclude Include="ScriptCmds\ScriptHelpers.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Mex\CudaMex.cpp" /> <ClCompile Include="Mex\CudaMex.cpp" />
......
src/c/CudaMex.vcxproj.filters
+ 1
− 1
View file @ b1b8b943
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<ClInclude Include="Mex\MexTypes.h"> <ClInclude Include="Mex\MexTypes.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptHelpers.h"> <ClInclude Include="ScriptCmds\ScriptHelpers.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
......
src/c/CudaMex_old.vcxproj.filters deleted 100644 → 0
+ 0
− 247
View file @ 1df86889
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>.c;.cpp;.cu</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>
</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Source Files\MexFiles">
<UniqueIdentifier>{0ad41ffd-0299-4ef8-b792-46648595117e}</UniqueIdentifier>
<Extensions>Mex*</Extensions>
</Filter>
<Filter Include="Source Files\CudaFiles">
<UniqueIdentifier>{279c075e-2087-4b73-ad9c-b3682c96bd16}</UniqueIdentifier>
<Extensions>.cu</Extensions>
</Filter>
<Filter Include="Header Files\MexFiles">
<UniqueIdentifier>{c10b55ac-ef71-4755-b26a-6ec371f9c1db}</UniqueIdentifier>
<Extensions>Mex*.h</Extensions>
</Filter>
<Filter Include="Header Files\HelperFiles">
<UniqueIdentifier>{a1019f7e-4108-494e-a467-8da610158a60}</UniqueIdentifier>
<Extensions>.h</Extensions>
</Filter>
<Filter Include="Header Files\CudaFiles">
<UniqueIdentifier>{8ac1cf5b-4b8f-430c-b524-fe5e2dc948ba}</UniqueIdentifier>
<Extensions>.cuh</Extensions>
</Filter>
<Filter Include="Source Files\HelperFiles">
<UniqueIdentifier>{905415ab-5f50-407d-b8f1-b9eb9914f4e5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="CudaMex\CudaMex.def">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Cuda\CHelpers.cpp">
<Filter>Source Files\HelperFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\CudaMex.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexAddConstant.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexAddImageWith.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexApplyPolyTransformation.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexCommand.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexContrastEnhancement.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexGaussianFilter.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexHistogram.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexImagePow.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMaxFilterEllipsoid.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMaxFilterKernel.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMaxFilterNeighborhood.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMeanFilter.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMedianFilter.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMinFilterEllipsoid.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMinFilterKernal.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMinFilterNeighborhood.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMinMax.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMorphologicalOpening.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMultiplyImage.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMultiplyImageWith.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexNormalizedCovariance.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexNormalizedHistogram.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexOtsuThresholdFilter.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexOtsuThresholdValue.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexReduceImage.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexSumArray.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexThresholdFilter.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
<ClCompile Include="Mex\MexMorphologicalClosure.cpp">
<Filter>Source Files\MexFiles</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="Cuda\CudaUtilities.cu">
<Filter>Source Files\CudaFiles</Filter>
</CudaCompile>
<CudaCompile Include="Cuda\CWrappers.cu">
<Filter>Source Files\CudaFiles</Filter>
</CudaCompile>
<CudaCompile Include="Cuda\ImageChunk.cu">
<Filter>Source Files\CudaFiles</Filter>
</CudaCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Cuda\CudaAdd.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaContrastEnhancement.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaDeviceImages.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaGaussianFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaGetMinMax.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaGetROI.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaHistogram.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaImageContainer.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaImageContainerClean.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaImageReduction.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaIntensityProjection.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMask.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMaxFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMeanFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMedianFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMinFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMorphologicalOperations.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMultAddFilter.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaMultiplyImage.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaNormalizedCovariance.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaPolyTransferFunc.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaPow.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaSum.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaThreshold.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CudaUtilities.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CWrappers.cuh">
<Filter>Header Files\CudaFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\CHelpers.h">
<Filter>Header Files\HelperFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\Defines.h">
<Filter>Header Files\HelperFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\ImageChunk.cuh">
<Filter>Header Files\HelperFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\Vec.h">
<Filter>Header Files\HelperFiles</Filter>
</ClInclude>
<ClInclude Include="Cuda\VecFuncs.h">
<Filter>Header Files\HelperFiles</Filter>
</ClInclude>
<ClInclude Include="Mex\MexCommand.h">
<Filter>Header Files\MexFiles</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
src/c/CudaPy3DLL.vcxproj
+ 19
− 19
View file @ b1b8b943
...@@ -29,27 +29,27 @@ ...@@ -29,27 +29,27 @@
<ClInclude Include="mph\preproc_helper.h" /> <ClInclude Include="mph\preproc_helper.h" />
<ClInclude Include="mph\qualifier_helpers.h" /> <ClInclude Include="mph\qualifier_helpers.h" />
<ClInclude Include="mph\tuple_helpers.h" /> <ClInclude Include="mph\tuple_helpers.h" />
<ClInclude Include="Python\PyArgConverter.h" />
<ClInclude Include="Python\PyIncludes.h" /> <ClInclude Include="Python\PyIncludes.h" />
<ClInclude Include="Python\PyTypes.h" /> <ClInclude Include="Python\PyTypes.h" />
<ClInclude Include="WrapCmds\ArgConverter.h" /> <ClInclude Include="ScriptCmds\ArgConverter.h" />
<ClInclude Include="WrapCmds\GenCommands.h" /> <ClInclude Include="ScriptCmds\GenCommands.h" />
<ClInclude Include="WrapCmds\PyArgConverter.h" /> <ClInclude Include="ScriptCmds\ScrCmdClosure.h" />
<ClInclude Include="WrapCmds\ScrCmdClosure.h" /> <ClInclude Include="ScriptCmds\ScrCmdDeviceCount.h" />
<ClInclude Include="WrapCmds\ScrCmdDeviceCount.h" /> <ClInclude Include="ScriptCmds\ScrCmdDeviceStats.h" />
<ClInclude Include="WrapCmds\ScrCmdDeviceStats.h" /> <ClInclude Include="ScriptCmds\ScrCmdHelp.h" />
<ClInclude Include="WrapCmds\ScrCmdHelp.h" /> <ClInclude Include="ScriptCmds\ScrCmdInfo.h" />
<ClInclude Include="WrapCmds\ScrCmdInfo.h" /> <ClInclude Include="ScriptCmds\ScriptCommand.h" />
<ClInclude Include="WrapCmds\ScriptCommand.h" /> <ClInclude Include="ScriptCmds\ScriptCommandDefines.h" />
<ClInclude Include="WrapCmds\ScriptCommandDefines.h" /> <ClInclude Include="ScriptCmds\ScriptCommandModule.h" />
<ClInclude Include="WrapCmds\ScriptCommandModule.h" /> <ClInclude Include="ScriptCmds\ScriptCommands.h" />
<ClInclude Include="WrapCmds\ScriptCommands.h" /> <ClInclude Include="ScriptCmds\ScriptCommandImpl.h" />
<ClInclude Include="WrapCmds\ScriptCommandImpl.h" /> <ClInclude Include="ScriptCmds\ScriptHelpers.h" />
<ClInclude Include="WrapCmds\ScriptHelpers.h" /> <ClInclude Include="ScriptCmds\CommandList.h" />
<ClInclude Include="WrapCmds\CommandList.h" /> <ClInclude Include="ScriptCmds\ScriptIncludes.h" />
<ClInclude Include="WrapCmds\ScriptIncludes.h" /> <ClInclude Include="ScriptCmds\ScriptioMaps.h" />
<ClInclude Include="WrapCmds\ScriptioMaps.h" /> <ClInclude Include="ScriptCmds\ScriptTraits.h" />
<ClInclude Include="WrapCmds\ScriptTraits.h" /> <ClInclude Include="ScriptCmds\ScriptTraitTfms.h" />
<ClInclude Include="WrapCmds\ScriptTraitTfms.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
......
src/c/CudaPy3DLL.vcxproj.filters
+ 21
− 21
View file @ b1b8b943
...@@ -38,9 +38,6 @@ ...@@ -38,9 +38,6 @@
<ClInclude Include="Python\PyTypes.h"> <ClInclude Include="Python\PyTypes.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\PyArgConverter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mph\const_string.h"> <ClInclude Include="mph\const_string.h">
<Filter>Header Files\mph</Filter> <Filter>Header Files\mph</Filter>
</ClInclude> </ClInclude>
...@@ -56,60 +53,63 @@ ...@@ -56,60 +53,63 @@
<ClInclude Include="mph\preproc_helper.h"> <ClInclude Include="mph\preproc_helper.h">
<Filter>Header Files\mph</Filter> <Filter>Header Files\mph</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ArgConverter.h"> <ClInclude Include="ScriptCmds\ArgConverter.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\CommandList.h"> <ClInclude Include="ScriptCmds\CommandList.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\GenCommands.h"> <ClInclude Include="ScriptCmds\GenCommands.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptCommand.h"> <ClInclude Include="ScriptCmds\ScriptCommand.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptCommandDefines.h"> <ClInclude Include="ScriptCmds\ScriptCommandDefines.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptCommandImpl.h"> <ClInclude Include="ScriptCmds\ScriptCommandImpl.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptCommandModule.h"> <ClInclude Include="ScriptCmds\ScriptCommandModule.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptHelpers.h"> <ClInclude Include="ScriptCmds\ScriptHelpers.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptIncludes.h"> <ClInclude Include="ScriptCmds\ScriptIncludes.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptioMaps.h"> <ClInclude Include="ScriptCmds\ScriptioMaps.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptTraits.h"> <ClInclude Include="ScriptCmds\ScriptTraits.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptTraitTfms.h"> <ClInclude Include="ScriptCmds\ScriptTraitTfms.h">
<Filter>Header Files\ScriptCommand</Filter> <Filter>Header Files\ScriptCommand</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScriptCommands.h"> <ClInclude Include="ScriptCmds\ScriptCommands.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScrCmdHelp.h"> <ClInclude Include="ScriptCmds\ScrCmdHelp.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScrCmdClosure.h"> <ClInclude Include="ScriptCmds\ScrCmdClosure.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScrCmdInfo.h"> <ClInclude Include="ScriptCmds\ScrCmdInfo.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScrCmdDeviceCount.h"> <ClInclude Include="ScriptCmds\ScrCmdDeviceCount.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WrapCmds\ScrCmdDeviceStats.h"> <ClInclude Include="ScriptCmds\ScrCmdDeviceStats.h">
<Filter>Header Files\Commands</Filter> <Filter>Header Files\Commands</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Python\PyArgConverter.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
......
src/c/Mex/MexIncludes.h
+ 2
− 2
View file @ b1b8b943
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
#include <mex.h> #include <mex.h>
#include "../WrapCmds/ScriptHelpers.h" #include "ScriptCmds/ScriptHelpers.h"
#include "../WrapCmds/ScriptCommand.h" #include "ScriptCmds/ScriptCommand.h"
src/c/WrapCmds/PyArgConverter.h → src/c/Python/PyArgConverter.h
+ 4
− 4
View file @ b1b8b943
#include "../Cuda/ImageView.h" #include "Cuda/ImageView.h"
#include "mph/tuple_helpers.h" #include "mph/tuple_helpers.h"
#include "mph/qualifier_helpers.h" #include "mph/qualifier_helpers.h"
#include "mph/const_string.h" #include "mph/const_string.h"
#include "ScriptTraits.h" #include "ScriptCmds/ScriptTraits.h"
#include "ScriptTraitTfms.h" #include "ScriptCmds/ScriptTraitTfms.h"
#include "ArgConverter.h" #include "ScriptCmds/ArgConverter.h"
#include <tuple> #include <tuple>
#include <string> #include <string>
......
src/c/Python/PyCommandModule.cpp
+ 1
− 1
View file @ b1b8b943
#include "WrapCmds/ScriptCommandModule.h" #include "ScriptCmds/ScriptCommandModule.h"
src/c/Python/hip_module.cpp
+ 1
− 1
View file @ b1b8b943
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// This define forces inclusion of numpy symbols only in the hip_module.cpp file // This define forces inclusion of numpy symbols only in the hip_module.cpp file
#define NUMPY_IMPORT_MODULE #define NUMPY_IMPORT_MODULE
#include "../WrapCmds/ScriptIncludes.h" #include "ScriptCmds/ScriptIncludes.h"
// Make this a unique pointer just in case init can be run more than once // Make this a unique pointer just in case init can be run more than once
static std::unique_ptr<PyMethodDef[]> hip_methods = nullptr; static std::unique_ptr<PyMethodDef[]> hip_methods = nullptr;
......
src/c/WrapCmds/ArgConverter.h → src/c/ScriptCmds/ArgConverter.h
+ 0
− 0
View file @ b1b8b943
File moved
src/c/WrapCmds/GenCommands.h → src/c/ScriptCmds/GenCommands.h
+ 11
− 11
View file @ b1b8b943
...@@ -219,17 +219,17 @@ ...@@ -219,17 +219,17 @@
#define SCR_BEGIN_COMMANDS const ScriptCommand::CommandList ScriptCommand::m_commands = { #define SCR_BEGIN_COMMANDS const ScriptCommand::CommandList ScriptCommand::m_commands = {
#define SCR_END_COMMANDS }; #define SCR_END_COMMANDS };
#define SCR_CMD_NOPROC(Name, Params) _SCR_CMD_MAP_LINE(Name) #define SCR_CMD_NOPROC(Name, Params) _SCR_CMD_MAP_LINE(Name)
#define SCR_CMD(Name, Params, CudaFunc) _SCR_CMD_MAP_LINE(Name) #define SCR_CMD(Name, Params, CudaFunc) _SCR_CMD_MAP_LINE(Name)
#define _SCR_CMD_MAP_LINE(Name) \ #define _SCR_CMD_MAP_LINE(Name) \
{ \ { \
#Name, \ #Name, \
{&ScriptCommand_##Name::dispatch, \ {&ScriptCommand_##Name::dispatch, \
&ScriptCommand_##Name::usage, \ &ScriptCommand_##Name::usage, \
&ScriptCommand_##Name::help, \ &ScriptCommand_##Name::help, \
&ScriptCommand_##Name::info} \ &ScriptCommand_##Name::info} \
}, },
#else #else
// Don't generate code for any other inclusions // Don't generate code for any other inclusions
......
src/c/WrapCmds/ScrCmdClosure.h → src/c/ScriptCmds/ScrCmdClosure.h
+ 0
− 0
View file @ b1b8b943
File moved
src/c/WrapCmds/ScrCmdHelp.h → src/c/ScriptCmds/ScrCmdHelp.h
+ 0
− 0
View file @ b1b8b943
File moved
src/c/WrapCmds/ScrCmdInfo.h → src/c/ScriptCmds/ScrCmdInfo.h
+ 0
− 0
View file @ b1b8b943
File moved
src/c/WrapCmds/ScriptCommand.h → src/c/ScriptCmds/ScriptCommand.h
+ 0
− 0
View file @ b1b8b943
File moved
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