Skip to content

Commit 96f6c5f

Browse files
committed
finish fix.
1 parent 9466830 commit 96f6c5f

5 files changed

Lines changed: 8 additions & 16 deletions

File tree

.github/workflows/build-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ jobs:
235235
- name: Run unit tests
236236
if: ${{ inputs.coverage == 'false' }}
237237
run: |
238-
cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --parallel --config ${{ matrix.build-type }} --target check_verbose
238+
cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --parallel --config ${{ matrix.build-type }} --target check
239239
cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --parallel --config ${{ matrix.build-type }} --target Install_CoreExample
240240
"${{ steps.paths.outputs.radium_install_dir }}/bin/CoreExample"
241241

src/Core/CoreMacros.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// clang-format off
1414
#pragma once
1515

16-
#include <Eigen/Core>
1716
#include <cassert>
1817
#include <cstdio>
1918
#include <iostream>
@@ -401,5 +400,4 @@ MACRO_END
401400
#ifndef eigen_assert
402401
#define eigen_assert(XXX) CORE_ASSERT(XXX, "Eigen Assert");
403402
#endif
404-
405403
// clang-format on

src/Core/Geometry/TriangleMesh.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,6 @@ inline void AttribArrayGeometry::initDefaultAttribs() {
444444
m_normalsHandle = m_vertexAttribs.addAttrib<NormalAttribHandle::value_type>(
445445
getAttribName( MeshAttrib::VERTEX_NORMAL ) );
446446
invalidateAabb();
447-
448-
std::cerr << "debug init default " << getAttribName( VERTEX_POSITION ) << "\n";
449-
vertexAttribs().for_each_attrib(
450-
[]( const Utils::AttribBase* a ) { std::cerr << "attrib " << a->getName() << "\n"; } );
451447
}
452448

453449
template <typename T>

tests/unittest/Core/indexview.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ TEST_CASE( "Core/Geometry/IndexedGeometry/Attributes",
103103
MultiIndexedGeometry mesh( Ra::Core::Geometry::makeBox() );
104104

105105
// base attributes are automatically added
106-
std::cerr << getAttribName( VERTEX_POSITION ) << "\n";
107-
mesh.vertexAttribs().for_each_attrib(
108-
[]( const AttribBase* a ) { std::cerr << "attrib " << a->getName() << "\n"; } );
109106
auto h_pos = mesh.getAttribHandle<Vector3>( getAttribName( VERTEX_POSITION ) );
110107
REQUIRE( mesh.isValid( h_pos ) );
111108
auto h_nor = mesh.getAttribHandle<Vector3>( getAttribName( VERTEX_NORMAL ) );

tests/unittest/Dataflow/graph.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,13 @@ TEST_CASE( "Dataflow/Core/Graph/Inspection of a graph", "[unittests][Dataflow][C
345345
using namespace Ra::Dataflow::Core;
346346

347347
// add some nodes to factory
348-
using ScalarFilterSource = Sources::FunctionSourceNode<Scalar, const Scalar&>;
349-
using ScalarFunctionSource = Sources::FunctionSourceNode<Scalar, const Scalar&, const Scalar&>;
350-
using ScalarPredicateSource = Sources::FunctionSourceNode<bool, const Scalar&, const Scalar&>;
351-
using ReduceNode = Functionals::ReduceNode<Ra::Core::VectorArray<Scalar>>;
352-
using TransformNode = Functionals::TransformNode<Ra::Core::VectorArray<Scalar>>;
353-
using ScalarVectorSource = Sources::SingleDataSourceNode<Ra::Core::VectorArray<Scalar>>;
348+
// using ScalarFilterSource = Sources::FunctionSourceNode<Scalar, const Scalar&>;
349+
// using ScalarFunctionSource = Sources::FunctionSourceNode<Scalar, const Scalar&, const
350+
// Scalar&>; using ScalarPredicateSource = Sources::FunctionSourceNode<bool, const Scalar&,
351+
// const Scalar&>; using ReduceNode =
352+
// Functionals::ReduceNode<Ra::Core::VectorArray<Scalar>>; using TransformNode =
353+
// Functionals::TransformNode<Ra::Core::VectorArray<Scalar>>; using ScalarVectorSource =
354+
// Sources::SingleDataSourceNode<Ra::Core::VectorArray<Scalar>>;
354355

355356
std::cout << "Loading graph data/Dataflow/ExampleGraph.json\n";
356357

0 commit comments

Comments
 (0)