buffers refactor

jdermody · Feb 20, 2021 · eb59a70 · eb59a70
1 parent 50213f9
commit eb59a70
Show file tree

Hide file tree

Showing 34 changed files with 551 additions and 234 deletions.
diff --git a/BrightData.Cuda/BrightData.Cuda.csproj b/BrightData.Cuda/BrightData.Cuda.csproj
@@ -2,6 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>3.0.0-beta</Version>
+    <Authors>Jack Dermody</Authors>
+    <Company />
+    <Product />
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <RepositoryUrl>https://github.com/jdermody/brightwire</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/jdermody/brightwire</PackageProjectUrl>
+    <Description>Cuda provider for Bright Data - allows GPU computation</Description>
+    <Copyright>Copyright © Jack Dermody 2016-2021</Copyright>
+    <PackageTags>cuda gpu</PackageTags>
+    <PackageIcon>bw_favicon.png</PackageIcon>
+    <PackageReleaseNotes>Beta release</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -12,6 +24,30 @@
     <Compile Remove="Properties\**" />
     <EmbeddedResource Remove="Properties\**" />
     <None Remove="Properties\**" />
+    <None Remove="cuda\brightwire.ptx" />
+    <Content Include="cuda\brightwire.ptx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="..\bw_favicon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="managed-cuda\CudaBlas.netCore.dll">
+      <Pack>True</Pack>
+      <PackagePath>lib/netcoreapp3.1</PackagePath>
+    </None>
+    <None Include="managed-cuda\CudaSolve.netCore.dll">
+      <Pack>True</Pack>
+      <PackagePath>lib/netcoreapp3.1</PackagePath>
+    </None>
+    <None Include="managed-cuda\ManagedCuda.netCore.dll">
+      <Pack>True</Pack>
+      <PackagePath>lib/netcoreapp3.1</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -34,10 +70,4 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="cuda\brightwire.ptx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/BrightData.Numerics/BrightData.Numerics.csproj b/BrightData.Numerics/BrightData.Numerics.csproj
@@ -2,6 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>3.0.0-beta</Version>
+    <Authors>Jack Dermody</Authors>
+    <Product>Bright ML</Product>
+    <Description>Numerics provider for Bright Data - allows CPU computation, including with MKL</Description>
+    <Copyright>Copyright © Jack Dermody 2016-2021</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/jdermody/brightwire</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/jdermody/brightwire</RepositoryUrl>
+    <PackageTags>mkl</PackageTags>
+    <PackageIcon>bw_favicon.png</PackageIcon>
+    <PackageReleaseNotes>Beta release</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -16,4 +27,15 @@
     <ProjectReference Include="..\BrightData\BrightData.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\bw_favicon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/BrightData.UnitTests/BufferTests.cs b/BrightData.UnitTests/BufferTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using Xunit;
 using BrightData.Buffer;
 using FluentAssertions;
@@ -99,10 +100,11 @@ void StringBufferReadWriteTest(IBrightDataContext context, uint numItems, uint b
             using var stream = new MemoryStream();
             buffer.CopyTo(stream);
             stream.Seek(0, SeekOrigin.Begin);
+            using var reader = new BinaryReader(stream, Encoding.UTF8, true);
 
             uint index = 0;
-            var reader = context.GetReader<string>(stream, inMemoryReadSize);
-            foreach (var item in reader.EnumerateTyped())
+            var bufferReader = context.GetBufferReader<string>(reader, inMemoryReadSize);
+            foreach (var item in bufferReader.EnumerateTyped())
                 item.Should().Be(indexTranslator(index++));
         }
 
@@ -115,10 +117,11 @@ void ObjectBufferReadWriteTest<T>(IBrightDataContext context, uint numItems, uin
             using var stream = new MemoryStream();
             buffer.CopyTo(stream);
             stream.Seek(0, SeekOrigin.Begin);
+            using var reader = new BinaryReader(stream, Encoding.UTF8, true);
 
             uint index = 0;
-            var reader = context.GetReader<T>(stream, inMemoryReadSize);
-            foreach (var item in reader.EnumerateTyped())
+            var bufferReader = context.GetBufferReader<T>(reader, inMemoryReadSize);
+            foreach (var item in bufferReader.EnumerateTyped())
                 item.Should().Be(indexTranslator(index++));
         }
 
@@ -131,10 +134,11 @@ void StructBufferReadWriteTest<T>(IBrightDataContext context, uint numItems, uin
             using var stream = new MemoryStream();
             buffer.CopyTo(stream);
             stream.Seek(0, SeekOrigin.Begin);
+            using var reader = new BinaryReader(stream, Encoding.UTF8, true);
 
             uint index = 0;
-            var reader = context.GetReader<T>(stream, inMemoryReadSize);
-            foreach (var item in reader.EnumerateTyped())
+            var bufferReader = context.GetBufferReader<T>(reader, inMemoryReadSize);
+            foreach (var item in bufferReader.EnumerateTyped())
                 item.Should().Be(indexTranslator(index++));
         }
     }

diff --git a/BrightData/BrightData.csproj b/BrightData/BrightData.csproj
@@ -3,6 +3,18 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Version>3.0.0-beta</Version>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/jdermody/brightwire</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/jdermody/brightwire</RepositoryUrl>
+    <Authors>Jack Dermody</Authors>
+    <Company />
+    <Product>Bright ML</Product>
+    <Description>Bright data is a performance oriented data table and linear algebra library that supports both CPU and GPU computation</Description>
+    <Copyright>Copyright © Jack Dermody 2016-2021</Copyright>
+    <PackageIcon>bw_favicon.png</PackageIcon>
+    <PackageReleaseNotes>Beta release</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,4 +32,15 @@
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\bw_favicon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>