Commit 32d38de7 authored by Andrew Cohen's avatar Andrew Cohen

Pull from Github/HIP. ScopedProcessMutex, Cuda 9.2,

parent 766e42e8

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2009
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CudaMex", "CudaMex.vcxproj", "{6698E8EC-49D9-421E-AA87-5BCC6B466347}"
ProjectSection(ProjectDependencies) = postProject
......@@ -40,11 +40,13 @@ Global
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Debug|x86.ActiveCfg = Debug|Win32
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Debug|x86.Build.0 = Debug|Win32
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Release|x64.ActiveCfg = Release|x64
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Release|x64.Build.0 = Release|x64
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Release|x86.ActiveCfg = Release|Win32
{0957901A-E67A-40C2-9EF5-76DF8EFBC2D5}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {37E2637D-1039-47F0-B668-9457026E34F7}
EndGlobalSection
EndGlobal
......@@ -34,7 +34,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.1.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.2.props" />
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
......@@ -198,6 +198,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.1.targets" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.2.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
No preview for this file type
......@@ -14,6 +14,7 @@
// MexCommandInfo - This command can be used to provide an easy to parse matlab command info structure for all MEX commands.
std::string MexInfo::check(int nlhs,mxArray* plhs[],int nrhs,const mxArray* prhs[]) const
{
printf("HIP_LJS\n");
if(nrhs > 0)
return "No input arguments are supported.";
......
#pragma once
#define USE_PROCESS_MUTEX
#ifdef USE_PROCESS_MUTEX
#define SCOPED_PROCESS_MUTEX(Name) ScopedProcessMutex Name##_mutex(#Name)
#else
......
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