Skip to content

Commit 5e52a3b

Browse files
dpanfilyonokdpanfilyonok
committed
Update brahma.fsharp
1 parent d748b66 commit 5e52a3b

4 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ nuget System.CodeDom 4.7.0
1818
nuget FSharp.Quotations.Evaluator 2.1.0
1919
nuget FSharpx.Collections 2.1.3
2020
nuget FSharpx.Text.StructuredFormat 2.3.0
21-
nuget Brahma.FSharp.OpenCL.WorkflowBuilder 2.0.0-alpha6.1
21+
nuget Brahma.FSharp.OpenCL.WorkflowBuilder 2.0.0-alpha7
2222
nuget BenchmarkDotNet
2323
nuget MathNet.Numerics.FSharp
2424
nuget MathNet.Numerics.MKL.Win-x64 2.5.0

‎paket.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,34 @@ NUGET
2222
System.Threading.Tasks.Extensions (>= 4.5.2) - restriction: >= netstandard2.0
2323
System.ValueTuple (>= 4.5) - restriction: >= netstandard2.0
2424
BenchmarkDotNet.Annotations (0.12.1) - restriction: >= netstandard2.0
25-
Brahma.FSharp (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
26-
Brahma.FSharp.OpenCL.Printer (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
27-
Brahma.FSharp.OpenCL.Translator (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
25+
Brahma.FSharp (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
26+
Brahma.FSharp.OpenCL.Printer (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
27+
Brahma.FSharp.OpenCL.Translator (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
2828
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
2929
FSharp.Quotations.Evaluator (>= 2.1) - restriction: || (>= net461) (>= netstandard2.1)
30-
YC.Brahma (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
31-
YC.Brahma.OpenCL (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
32-
YC.OpenCL.NET (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
33-
Brahma.FSharp.OpenCL.AST (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
30+
YC.Brahma (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
31+
YC.Brahma.OpenCL (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
32+
YC.OpenCL.NET (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
33+
Brahma.FSharp.OpenCL.AST (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
3434
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
35-
Brahma.FSharp.OpenCL.Extensions (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
35+
Brahma.FSharp.OpenCL.Extensions (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
3636
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
37-
YC.Brahma.OpenCL (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
38-
YC.OpenCL.NET (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
39-
Brahma.FSharp.OpenCL.Printer (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
40-
Brahma.FSharp.OpenCL.AST (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
41-
Brahma.FSharp.OpenCL.Translator (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
37+
YC.Brahma.OpenCL (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
38+
YC.OpenCL.NET (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
39+
Brahma.FSharp.OpenCL.Printer (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
40+
Brahma.FSharp.OpenCL.AST (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
41+
Brahma.FSharp.OpenCL.Translator (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
4242
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
4343
FSharpx.Collections (>= 2.1.3) - restriction: || (>= net461) (>= netstandard2.1)
4444
FSharpx.Text.StructuredFormat (>= 2.3) - restriction: || (>= net461) (>= netstandard2.1)
45-
Brahma.FSharp.OpenCL.Translator (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
46-
Brahma.FSharp.OpenCL.AST (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
47-
Brahma.FSharp.OpenCL.Extensions (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
45+
Brahma.FSharp.OpenCL.Translator (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
46+
Brahma.FSharp.OpenCL.AST (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
47+
Brahma.FSharp.OpenCL.Extensions (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
4848
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
4949
FSharpx.Collections (>= 2.1.3) - restriction: || (>= net461) (>= netstandard2.1)
50-
Brahma.FSharp.OpenCL.WorkflowBuilder (2.0.0-alpha6.1)
51-
Brahma.FSharp (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
52-
Brahma.FSharp.OpenCL.Extensions (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
50+
Brahma.FSharp.OpenCL.WorkflowBuilder (2.0.0-alpha7)
51+
Brahma.FSharp (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
52+
Brahma.FSharp.OpenCL.Extensions (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
5353
FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.1)
5454
Chessie (0.6) - restriction: >= netcoreapp1.0
5555
FSharp.Core (>= 4.0.1.7-alpha) - restriction: >= netstandard1.6
@@ -925,11 +925,11 @@ NUGET
925925
System.Xml.XmlDocument (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp5.0)
926926
TypeShape (9.0)
927927
FSharp.Core (>= 4.3.2) - restriction: >= netstandard2.0
928-
YC.Brahma (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
929-
YC.Brahma.OpenCL (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
930-
YC.Brahma (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
931-
YC.OpenCL.NET (>= 2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
932-
YC.OpenCL.NET (2.0.0-alpha6.1) - restriction: || (>= net461) (>= netstandard2.1)
928+
YC.Brahma (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
929+
YC.Brahma.OpenCL (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
930+
YC.Brahma (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
931+
YC.OpenCL.NET (>= 2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
932+
YC.OpenCL.NET (2.0.0-alpha7) - restriction: || (>= net461) (>= netstandard2.1)
933933
ExtraConstraints.Fody (>= 1.14) - restriction: >= netstandard2.0
934934
Microsoft.Build.Framework (>= 16.6) - restriction: >= netstandard2.0
935935
System.CodeDom (>= 4.7) - restriction: >= netstandard2.0

‎tests/GraphBLAS-sharp.Tests/MatrixOperationsTests/MxvTests.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ let testFixtures case = [
219219

220220
case
221221
|> correctnessGenericTest<CustomDatatypes.WrappedInt> CustomDatatypes.addMultSemiringOnWrappedInt (=)
222-
|> ftestPropertyWithConfig config (getCorrectnessTestName "WrappedInt")
222+
|> ptestPropertyWithConfig config (getCorrectnessTestName "WrappedInt")
223223
]
224224

225225
let tests =

‎tests/GraphBLAS-sharp.Tests/Program.fs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@ open GraphBLAS.FSharp
1010
open GraphBLAS.FSharp.Algorithms
1111
open GraphBLAS.FSharp.IO
1212

13-
// [<Tests>]
14-
// let allTests =
15-
// testList "All tests" [
16-
// Backend.PrefixSum.tests
17-
// Backend.BitonicSort.tests
18-
// Backend.RemoveDuplicates.tests
19-
// Matrix.EWiseAdd.tests
20-
// Matrix.GetTuples.tests
21-
// Matrix.Mxv.tests
22-
// Matrix.Transpose.tests
23-
// Algo.Bfs.tests
24-
// ]
25-
// |> testSequenced
13+
[<Tests>]
14+
let allTests =
15+
testList "All tests" [
16+
Backend.PrefixSum.tests
17+
Backend.BitonicSort.tests
18+
Backend.RemoveDuplicates.tests
19+
Matrix.EWiseAdd.tests
20+
Matrix.GetTuples.tests
21+
Matrix.Mxv.tests
22+
Matrix.Transpose.tests
23+
Algo.Bfs.tests
24+
]
25+
|> testSequenced
2626

2727
[<EntryPoint>]
2828
let main argv =
29-
// allTests
30-
// |> runTestsWithCLIArgs [] argv
29+
allTests
30+
|> runTestsWithCLIArgs [] argv
3131

32-
graphblas {
33-
let! matrix =
34-
MtxReader("webbase-1M.mtx").ReadMatrix(fun _ -> 1)
35-
|> Matrix.switch CSR
36-
>>= Matrix.synchronizeAndReturn
37-
let! vector = Vector.ofList matrix.ColumnCount (List.init matrix.ColumnCount (fun i -> i, 1))
38-
return!
39-
Matrix.mxv Predefined.AddMult.int matrix vector
40-
>>= Vector.synchronizeAndReturn
41-
}
42-
|> EvalGB.withClContext (OpenCLEvaluationContext())
43-
|> EvalGB.runSync
44-
|> printfn "%A"
32+
// graphblas {
33+
// let! matrix =
34+
// MtxReader("webbase-1M.mtx").ReadMatrix(fun _ -> 1)
35+
// |> Matrix.switch CSR
36+
// >>= Matrix.synchronizeAndReturn
37+
// let! vector = Vector.ofList matrix.ColumnCount (List.init matrix.ColumnCount (fun i -> i, 1))
38+
// return!
39+
// Matrix.mxv Predefined.AddMult.int matrix vector
40+
// >>= Vector.synchronizeAndReturn
41+
// }
42+
// |> EvalGB.withClContext (OpenCLEvaluationContext())
43+
// |> EvalGB.runSync
44+
// |> printfn "%A"
4545

46-
0
46+
// 0

0 commit comments

Comments
 (0)