Skip to content

Commit 81aaf6e

Browse files
author
Vincent Wilms
committed
Fix code and CI
1 parent d4413bd commit 81aaf6e

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

‎.github/workflows/build-and-publish.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
sudo ln -s $(pwd)/HDF5-1.14.4.2-Linux/HDF_Group/HDF5/1.14.4.2/bin/h5dump /usr/bin/h5dump
5454
h5dump --version
5555
56+
- uses: actions/setup-dotnet@v5
57+
with:
58+
dotnet-version: '6.0.36'
59+
5660
- name: Build
5761
run: |
5862
dotnet build -c Release src/PureHDF/PureHDF.csproj

‎tests/PureHDF.Tests/Filters/FilterTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ public void CanShuffleGeneric<T>(T dummy, int length)
838838
ShuffleGeneric.DoShuffle(
839839
bytesOfType,
840840
source: actual_unshuffled,
841-
destination: MemoryMarshal.AsBytes<T>(actual));
841+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
842842

843843
// Assert
844844
Assert.True(expected.SequenceEqual(actual));
@@ -864,7 +864,7 @@ public void CanShuffleGeneric_16()
864864
ShuffleGeneric.DoShuffle(
865865
bytesOfType,
866866
source: actual_unshuffled,
867-
destination: MemoryMarshal.AsBytes<decimal>(actual));
867+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
868868

869869
// Assert
870870
Assert.True(expected.SequenceEqual(actual));
@@ -950,7 +950,7 @@ public void CanShuffleAvx2<T>(T dummy, int length)
950950
ShuffleAvx2.DoShuffle(
951951
bytesOfType,
952952
source: actual_unshuffled,
953-
destination: MemoryMarshal.AsBytes<T>(actual));
953+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
954954

955955
// Assert
956956
Assert.True(expected.SequenceEqual(actual));
@@ -976,7 +976,7 @@ public void CanShuffleAvx2_16()
976976
ShuffleAvx2.DoShuffle(
977977
bytesOfType,
978978
source: actual_unshuffled,
979-
destination: MemoryMarshal.AsBytes<decimal>(actual));
979+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
980980

981981
// Assert
982982
Assert.True(expected.SequenceEqual(actual));
@@ -1063,7 +1063,7 @@ public void CanShuffleSse2<T>(T dummy, int length)
10631063
ShuffleSse2.DoShuffle(
10641064
bytesOfType,
10651065
source: actual_unshuffled,
1066-
destination: MemoryMarshal.AsBytes<T>(actual));
1066+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
10671067

10681068
// Assert
10691069
Assert.True(expected.SequenceEqual(actual));
@@ -1089,7 +1089,7 @@ public void CanShuffleSse2_16()
10891089
ShuffleSse2.DoShuffle(
10901090
bytesOfType,
10911091
source: actual_unshuffled,
1092-
destination: MemoryMarshal.AsBytes<decimal>(actual));
1092+
destination: MemoryMarshal.AsBytes(actual.AsSpan()));
10931093

10941094
// Assert
10951095
Assert.True(expected.SequenceEqual(actual));

‎tests/PureHDF.Tests/Selections/SelectionTests.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -764,19 +764,19 @@ public void CanCopySmall2D_BlockGreater1_StrideGreater1()
764764

765765
// s0
766766
var sourceBuffer0 = new byte[6 * 6 * sizeof(int)];
767-
var s0 = MemoryMarshal.Cast<byte, int>(sourceBuffer0);
767+
var s0 = MemoryMarshal.Cast<byte, int>(sourceBuffer0.AsSpan());
768768
s0[1] = 1; s0[2] = 2; s0[7] = 5; s0[8] = 6; s0[13] = 9; s0[14] = 10; s0[31] = 13; s0[32] = 14;
769769

770770
var sourceBuffer1 = new byte[6 * 6 * sizeof(int)];
771-
var s1 = MemoryMarshal.Cast<byte, int>(sourceBuffer1);
771+
var s1 = MemoryMarshal.Cast<byte, int>(sourceBuffer1.AsSpan());
772772
s1[0] = 3; s1[1] = 4; s1[6] = 7; s1[7] = 8; s1[12] = 11; s1[13] = 12; s1[30] = 15; s1[31] = 16;
773773

774774
var sourceBuffer2 = new byte[6 * 6 * sizeof(int)];
775-
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2);
775+
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2.AsSpan());
776776
s2[1] = 17; s2[2] = 18; s2[7] = 21; s2[8] = 22;
777777

778778
var sourceBuffer3 = new byte[6 * 6 * sizeof(int)];
779-
var s3 = MemoryMarshal.Cast<byte, int>(sourceBuffer3);
779+
var s3 = MemoryMarshal.Cast<byte, int>(sourceBuffer3.AsSpan());
780780
s3[0] = 19; s3[1] = 20; s3[6] = 23; s3[7] = 24;
781781

782782
var chunksBuffers = new Memory<byte>[]
@@ -858,35 +858,35 @@ public void CanCopySmall3D_Block1_Stride1()
858858

859859
// source
860860
var sourceBuffer1 = new byte[1 * 2 * 3 * sizeof(int)];
861-
var s1 = MemoryMarshal.Cast<byte, int>(sourceBuffer1);
861+
var s1 = MemoryMarshal.Cast<byte, int>(sourceBuffer1.AsSpan());
862862
s1[0] = 0; s1[1] = 1; s1[2] = 2; s1[3] = 6; s1[4] = 7; s1[5] = 8;
863863

864864
var sourceBuffer2 = new byte[1 * 2 * 3 * sizeof(int)];
865-
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2);
865+
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2.AsSpan());
866866
s2[0] = 3; s2[1] = 4; s2[2] = 5; s2[3] = 9; s2[4] = 10; s2[5] = 11;
867867

868868
var sourceBuffer3 = new byte[1 * 2 * 3 * sizeof(int)];
869-
var s3 = MemoryMarshal.Cast<byte, int>(sourceBuffer3);
869+
var s3 = MemoryMarshal.Cast<byte, int>(sourceBuffer3.AsSpan());
870870
s3[0] = 12; s3[1] = 13; s3[2] = 14; s3[3] = 0; s3[4] = 0; s3[5] = 0;
871871

872872
var sourceBuffer4 = new byte[1 * 2 * 3 * sizeof(int)];
873-
var s4 = MemoryMarshal.Cast<byte, int>(sourceBuffer4);
873+
var s4 = MemoryMarshal.Cast<byte, int>(sourceBuffer4.AsSpan());
874874
s4[0] = 15; s4[1] = 16; s4[2] = 17; s4[3] = 0; s4[4] = 0; s4[5] = 0;
875875

876876
var sourceBuffer5 = new byte[1 * 2 * 3 * sizeof(int)];
877-
var s5 = MemoryMarshal.Cast<byte, int>(sourceBuffer5);
877+
var s5 = MemoryMarshal.Cast<byte, int>(sourceBuffer5.AsSpan());
878878
s5[0] = 18; s5[1] = 19; s5[2] = 20; s5[3] = 24; s5[4] = 25; s5[5] = 26;
879879

880880
var sourceBuffer6 = new byte[1 * 2 * 3 * sizeof(int)];
881-
var s6 = MemoryMarshal.Cast<byte, int>(sourceBuffer6);
881+
var s6 = MemoryMarshal.Cast<byte, int>(sourceBuffer6.AsSpan());
882882
s6[0] = 21; s6[1] = 22; s6[2] = 23; s6[3] = 27; s6[4] = 28; s6[5] = 29;
883883

884884
var sourceBuffer7 = new byte[1 * 2 * 3 * sizeof(int)];
885-
var s7 = MemoryMarshal.Cast<byte, int>(sourceBuffer7);
885+
var s7 = MemoryMarshal.Cast<byte, int>(sourceBuffer7.AsSpan());
886886
s7[0] = 30; s7[1] = 31; s7[2] = 32; s7[3] = 0; s7[4] = 0; s7[5] = 0;
887887

888888
var sourceBuffer8 = new byte[1 * 2 * 3 * sizeof(int)];
889-
var s8 = MemoryMarshal.Cast<byte, int>(sourceBuffer8);
889+
var s8 = MemoryMarshal.Cast<byte, int>(sourceBuffer8.AsSpan());
890890
s8[0] = 33; s8[1] = 34; s8[2] = 35; s8[3] = 0; s8[4] = 0; s8[5] = 0;
891891

892892
var chunksBuffers = new Memory<byte>[]
@@ -978,45 +978,45 @@ public void CanCopySmall3D_Block1_StrideGreater1()
978978

979979
// s0
980980
var sourceBuffer0 = new byte[6 * 6 * 3 * sizeof(int)];
981-
var s0 = MemoryMarshal.Cast<byte, int>(sourceBuffer0);
981+
var s0 = MemoryMarshal.Cast<byte, int>(sourceBuffer0.AsSpan());
982982
s0[86] = 1;
983983

984984
// s2
985985
var sourceBuffer2 = new byte[6 * 6 * 3 * sizeof(int)];
986-
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2);
986+
var s2 = MemoryMarshal.Cast<byte, int>(sourceBuffer2.AsSpan());
987987
s2[84] = 2;
988988

989989
// s4
990990
var sourceBuffer4 = new byte[6 * 6 * 3 * sizeof(int)];
991-
var s4 = MemoryMarshal.Cast<byte, int>(sourceBuffer4);
991+
var s4 = MemoryMarshal.Cast<byte, int>(sourceBuffer4.AsSpan());
992992
s4[74] = 3;
993993
s4[80] = 5;
994994

995995
// s6
996996
var sourceBuffer6 = new byte[6 * 6 * 3 * sizeof(int)];
997-
var s6 = MemoryMarshal.Cast<byte, int>(sourceBuffer6);
997+
var s6 = MemoryMarshal.Cast<byte, int>(sourceBuffer6.AsSpan());
998998
s6[72] = 4;
999999
s6[78] = 6;
10001000

10011001
// s8
10021002
var sourceBuffer8 = new byte[6 * 6 * 3 * sizeof(int)];
1003-
var s8 = MemoryMarshal.Cast<byte, int>(sourceBuffer8);
1003+
var s8 = MemoryMarshal.Cast<byte, int>(sourceBuffer8.AsSpan());
10041004
s8[14] = 7;
10051005

10061006
// s10
10071007
var sourceBuffer10 = new byte[6 * 6 * 3 * sizeof(int)];
1008-
var s10 = MemoryMarshal.Cast<byte, int>(sourceBuffer10);
1008+
var s10 = MemoryMarshal.Cast<byte, int>(sourceBuffer10.AsSpan());
10091009
s10[12] = 8;
10101010

10111011
// s12
10121012
var sourceBuffer12 = new byte[6 * 6 * 3 * sizeof(int)];
1013-
var s12 = MemoryMarshal.Cast<byte, int>(sourceBuffer12);
1013+
var s12 = MemoryMarshal.Cast<byte, int>(sourceBuffer12.AsSpan());
10141014
s12[2] = 9;
10151015
s12[8] = 11;
10161016

10171017
// s14
10181018
var sourceBuffer14 = new byte[6 * 6 * 3 * sizeof(int)];
1019-
var s14 = MemoryMarshal.Cast<byte, int>(sourceBuffer14);
1019+
var s14 = MemoryMarshal.Cast<byte, int>(sourceBuffer14.AsSpan());
10201020
s14[0] = 10;
10211021
s14[6] = 12;
10221022

0 commit comments

Comments
 (0)