Skip to content

Commit d6b9256

Browse files
authored
Merge pull request #1 from mrange/vectorized-minmax-superfix
Vectorized minmax superfix
2 parents 1020115 + 3d19b51 commit d6b9256

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
##
44
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55

6+
# Apple
7+
.DS_Store
8+
69
# User-specific files
710
*.suo
811
*.user
@@ -221,7 +224,7 @@ ClientBin/
221224
*.publishsettings
222225
orleans.codegen.cs
223226

224-
# Including strong name files can present a security risk
227+
# Including strong name files can present a security risk
225228
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
226229
#*.snk
227230

@@ -317,7 +320,7 @@ __pycache__/
317320
# OpenCover UI analysis results
318321
OpenCover/
319322

320-
# Azure Stream Analytics local run output
323+
# Azure Stream Analytics local run output
321324
ASALocalRun/
322325

323326
# MSBuild Binary and Structured Log
@@ -326,6 +329,6 @@ ASALocalRun/
326329
# NVidia Nsight GPU debugger configuration file
327330
*.nvuser
328331

329-
# MFractors (Xamarin productivity tool) working folder
332+
# MFractors (Xamarin productivity tool) working folder
330333
.mfractor/
331334
/tests/TestFiles

src/SharpGLTF.Core/Schema2/VectorMinMax.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if NET6_0_OR_GREATER
12
using System;
23
using System.Numerics;
34
using System.Runtime.Intrinsics;
@@ -307,4 +308,5 @@ private static unsafe void ProcessRemainingElements(float* ptr, int start, int l
307308
}
308309
}
309310
}
310-
}
311+
}
312+
#endif

src/SharpGLTF.Core/Schema2/gltf.Accessors.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ protected override IEnumerable<ExtraProperties> GetLogicalChildren()
149149
return base.GetLogicalChildren().ConcatElements(_sparse);
150150
}
151151

152+
#if NET6_0_OR_GREATER
152153
public void UpdateBounds()
153154
{
154155
this._min.Clear();
@@ -173,8 +174,8 @@ public void UpdateBounds()
173174
_max.Add(max[i]);
174175
}
175176
}
176-
177-
public void UpdateBoundsOld()
177+
#else
178+
public void UpdateBounds()
178179
{
179180
this._min.Clear();
180181
this._max.Clear();
@@ -209,6 +210,7 @@ public void UpdateBoundsOld()
209210
}
210211
}
211212
}
213+
#endif
212214

213215
#endregion
214216

src/SharpGLTF.Core/SharpGLTF.Core.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,4 @@
2828
</None>
2929
</ItemGroup>
3030

31-
<ItemGroup>
32-
<PackageReference Include="System.Numerics.Tensors" Version="8.0.0" />
33-
</ItemGroup>
34-
3531
</Project>

src/SharpGLTF.Toolkit/.DS_Store

-6 KB
Binary file not shown.
-6 KB
Binary file not shown.

0 commit comments

Comments
 (0)