Make it actually compile (#27)

Author: thewilsonator

dub.json

@@ -9,5 +9,5 @@
         "derelict-cuda": "~>2.0.1",
         "taggedalgebraic": "~>0.10.7"
 	},
-    "dflags" : ["-mdcompute-targets=cuda-350" , "-vv", "-oq", "-betterC"]
+    "dflags" : ["-mdcompute-targets=cuda-350" , "-oq", "-betterC"]
 }

source/dcompute/driver/cuda650/TODO renamed to source/dcompute/driver/cuda/TODO

@@ -1,4 +1,6 @@
-module dcompute.driver.cuda650.buffer;
+module dcompute.driver.cuda.buffer;
+
+import dcompute.driver.cuda;
 
 struct Buffer(T)
 {
@@ -10,3 +12,5 @@ struct Buffer(T)
         checkErrors();
     }
 }
+
+alias bf = Buffer!float;

source/dcompute/driver/cuda650/buffer.d renamed to source/dcompute/driver/cuda/buffer.d

@@ -1,11 +1,13 @@
-module dcompute.driver.cuda650.context;
+module dcompute.driver.cuda.context;
+
+import dcompute.driver.cuda;
 
 struct Context
 {
     void* raw;
     this(Device dev, uint flags)
     {
-        status = cast(Status)cuCtxCreate(&raw, flags,dev);
+        status = cast(Status)cuCtxCreate(&raw, flags,dev.raw);
         checkErrors();
     }
 
@@ -20,15 +22,17 @@ struct Context
         Context ret;
         status = cast(Status)cuCtxPopCurrent(&ret.raw);
         checkErrors();
+		return ret;
     }
-    static Context @property current()
+    static @property Context current()
     {
         Context ret;
         status = cast(Status)cuCtxGetCurrent(&ret.raw);
         checkErrors();
+		return ret;
     }
 
-    static void @property current(Context ctx)
+    static @property void current(Context ctx)
     {
         status = cast(Status)cuCtxSetCurrent(ctx.raw);
         checkErrors();
@@ -49,13 +53,13 @@ struct Context
         deviceRuntimePendingLaunchCount
     }
 
-    static void @property limit(Limit what)(size_t lim)
+    static @property void limit(Limit what)(size_t lim)
     {
         status = cast(Status)cuCtxSetLimit(what,lim);
         checkErrors();
     }
 
-    static size_t @property limit(Limit what)()
+    static @property size_t limit(Limit what)()
     {
         size_t ret;
         status = cast(Status)cuCtxSetLimit(&ret,what);
@@ -81,15 +85,15 @@ struct Context
     static @property CacheConfig cacheConfig()
     {
         CacheConfig ret;
-        status = cast(Status)cuCtxSetSharedMemConfig(&ret);
+        status = cast(Status)cuCtxGetSharedMemConfig(cast(int*)&ret);
         checkErrors();
         return ret;
     }
 
     @property uint apiVersion()
     {
         uint ret;
-        status = cast(Status)cuCtxGetApiVersion(&ret);
+        status = cast(Status)cuCtxGetApiVersion(raw,&ret);
         checkErrors();
         return ret;
     }

source/dcompute/driver/cuda650/context.d renamed to source/dcompute/driver/cuda/context.d

@@ -1,4 +1,6 @@
-module dcompute.driver.cuda650.device;
+module dcompute.driver.cuda.device;
+
+import dcompute.driver.cuda;
 
 struct Device
 {
@@ -90,13 +92,13 @@ struct Device
         @(79) int globalL1CacheSupported;
         @(80) int localL1CacheSupported;
         @(81) int maxSharedMemoryPerMultiprocessor;
-        @(82) int maxRegistorsPerMultiprocessor
+        @(82) int maxRegistorsPerMultiprocessor;
         @(83) int managedMemory;
         @(84) int multiGPUBoard;
         @(85) int multiGPUBoardGroupID;
     }
 
-    @proprty size_t totalMemory()
+    @property size_t totalMemory()
     {
         size_t ret;
         status = cast(Status)cuDeviceTotalMem(&ret,raw);

source/dcompute/driver/cuda650/device.d renamed to source/dcompute/driver/cuda/device.d

@@ -0,0 +1,9 @@
+module dcompute.driver.cuda.event;
+
+import dcompute.driver.cuda;
+
+struct Event
+{
+    void* raw;
+    
+}

source/dcompute/driver/cuda/event.d

@@ -1,5 +1,6 @@
-module dcompute.driver.cuda650.kernel;
+module dcompute.driver.cuda.kernel;
 
+import dcompute.driver.cuda;
 struct Kernel(F) if (is(F==function)|| is(F==void))
 {
     void* raw;
@@ -17,13 +18,5 @@ struct Kernel(F) if (is(F==function)|| is(F==void))
         @(6) int binaryVersion;
         @(7) int cacheModeCa;
     }
-    
 
-    
-    enum MemoryBankConfig : int
-    {
-        default_,
-        fourBytes,
-        eightBytes,
-    }
 }

source/dcompute/driver/cuda650/kernel.d renamed to source/dcompute/driver/cuda/kernel.d

@@ -1,14 +1,15 @@
-module dcompute.driver.cuda650.memory;
+module dcompute.driver.cuda.memory;
 
 import dcompute.driver.error;
+import dcompute.driver.cuda;
 
 // void pointer like
 struct MemoryPointer
 {
     size_t raw;
     static MemoryPointer allocate(size_t nbytes)
     {
-        Memory ret;
+        MemoryPointer ret;
         status = cast(Status)cuMemAlloc(&ret.raw,nbytes);
         checkErrors();
         return ret;
@@ -18,8 +19,9 @@ struct MemoryPointer
     Memory addressRange()
     {
         Memory ret;
-        status = cast(Status)cuMemGetAddressRange(&ret.raw,&ret.length,raw);
+        status = cast(Status)cuMemGetAddressRange(&ret.ptr.raw,&ret.length,raw);
         checkErrors();
+		return ret;
     }
 
 }
@@ -39,6 +41,7 @@ struct Memory
 
     // cuMemcpy and friends
     // TODO: implement this properly
+	/*
     template copy(T, CopySource from, CopySource to, int dimentions = 1,
                   Flag!"peer" _peer = No.peer)
     {
@@ -47,7 +50,7 @@ struct Memory
             status = cast(Status)cuMemcpy(to.ptr.raw,ptr.raw,length);
             checkErrors();
         }
-    }
+    }*/
 
     // TODO: cuMemset & frineds
 

source/dcompute/driver/cuda650/memory.d renamed to source/dcompute/driver/cuda/memory.d

@@ -0,0 +1,29 @@
+module dcompute.driver.cuda;
+
+public import derelict.cuda.driverapi;
+
+public import dcompute.driver.error;
+
+public import dcompute.driver.cuda.buffer;
+public import dcompute.driver.cuda.context;
+public import dcompute.driver.cuda.device;
+public import dcompute.driver.cuda.event;
+public import dcompute.driver.cuda.kernel;
+public import dcompute.driver.cuda.memory;
+public import dcompute.driver.cuda.platform;
+public import dcompute.driver.cuda.program;
+public import dcompute.driver.cuda.queue;
+
+enum CopySource
+{
+    host,
+    device,
+    array,
+}
+
+enum MemoryBankConfig : int
+{
+    default_,
+    fourBytes,
+    eightBytes,
+}

source/dcompute/driver/cuda/package.d

@@ -1,7 +1,8 @@
-module dcompute.driver.cuda650.platform;
+module dcompute.driver.cuda.platform;
 
 import dcompute.driver.error;
-import std.allocator.typed;
+import dcompute.driver.cuda;
+import std.experimental.allocator.typed;
 
 struct Platform
 {