Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-macos-build'

Browse Source 
d800a33c2 remove unused variables
bba3f1fa5 macos: use Xcode 14.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3117
This commit is contained in:
Vicente Bolea 2023-08-08 00:20:44 +00:00 committed by Kitware Robot
commit 5c6716f8e8
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab/ci/macos.yml
View File

@ -11,32 +11,32 @@
##=============================================================================
# Ad-hoc build that runs in macos machines
build:macos_xcode13:
build:macos_xcode14:
extends:
- .macos_xcode13
- .macos_xcode14
- .macos_build_tags
- .cmake_build_macos
- .run_automatically
test:macos_xcode13:
test:macos_xcode14:
extends:
- .macos_xcode13
- .macos_xcode14
- .macos_build_tags
- .cmake_test_macos
- .run_automatically
needs:
- build:macos_xcode13
- build:macos_xcode14
dependencies:
- build:macos_xcode13
- build:macos_xcode14
.macos_xcode13:
.macos_xcode14:
variables:
CMAKE_BUILD_TYPE: RelWithDebInfo
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
DEVELOPER_DIR: "/Applications/Xcode-13.3.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode-14.2.app/Contents/Developer"
GIT_CLONE_PATH: "$CI_BUILDS_DIR/vtk-m-ci"
VTKM_SETTINGS: "64bit_floats+shared+ccache"
@ -95,5 +95,5 @@ test:macos_xcode13:
tags:
- vtk-m
- macos-x86_64
- xcode-13.3
- xcode-14.2
- nonconcurrent

2
vtkm/filter/geometry_refinement/worklet/SplitSharpEdges.h
View File

@ -89,7 +89,6 @@ VTKM_EXEC int FindNeighborCellInLocalIndex(const vtkm::Id2& eOI,
{
int neighboringCellIndex = -1;
vtkm::IdComponent numberOfIncidentCells = incidentCells.GetNumberOfComponents();
size_t neighboringCellsCount = 0;
for (vtkm::IdComponent incidentCellIndex = 0; incidentCellIndex < numberOfIncidentCells;
incidentCellIndex++)
{
@ -122,7 +121,6 @@ VTKM_EXEC int FindNeighborCellInLocalIndex(const vtkm::Id2& eOI,
(canonicalEdgeId[0] == eOI[1] && canonicalEdgeId[1] == eOI[0]))
{
neighboringCellIndex = incidentCellIndex;
neighboringCellsCount++;
break;
}
}

4
vtkm/rendering/raytracing/ConnectivityTracer.cxx
View File

@ -435,14 +435,12 @@ public:
FloatType minDistance = static_cast<FloatType>(1e32);
FloatType maxDistance = static_cast<FloatType>(-1);
int hitCount = 0;
for (vtkm::Int32 i = 0; i < numFaces; ++i)
{
FloatType dist = distances[i];
if (dist != -1)
{
hitCount++;
if (dist < minDistance)
{
minDistance = dist;
@ -564,14 +562,12 @@ public:
vtkm::Int32 maxFace = -1;
FloatType minDistance = static_cast<FloatType>(1e32);
FloatType maxDistance = static_cast<FloatType>(-1);
int hitCount = 0;
for (int i = 0; i < numFaces; ++i)
{
FloatType dist = distances[i];
if (dist != -1)
{
hitCount++;
if (dist < minDistance)
{
minDistance = dist;