Skip to content
Snippets Groups Projects
  • Vít Hanousek's avatar
    5cbb4a1b
    Merge branch 'develop' into MIC-devel · 5cbb4a1b
    Vít Hanousek authored
    Nově zavedená stará implementace, lze přeložit s MIC i s CUDA, snad... Stále využívá Specializaci Array pro MIC.
    
    Conflicts:
    	build
    	src/TNL/Assert.h
    	src/TNL/Containers/Algorithms/ArrayOperations.h
    	src/TNL/Containers/Algorithms/VectorOperations.h
    	src/TNL/Containers/Array.h
    	src/TNL/Containers/SharedArray.h
    	src/TNL/Containers/SharedVector.h
    	src/TNL/Containers/StaticArray.h
    	src/TNL/File.h
    	src/TNL/File_impl.h
    	src/TNL/Matrices/CSR_impl.h
    	src/TNL/Matrices/MatrixSetter.h
    	src/TNL/Meshes/GridDetails/GridEntity_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter1D_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter2D_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter3D_impl.h
    	src/TNL/Meshes/GridEntity.h
    	src/TNL/Solvers/ODE/Euler_impl.h
    	src/core/arrays/tnlArray_impl.h
    	src/core/arrays/tnlSharedArray_impl.cpp
    	src/core/arrays/tnlSharedArray_impl.h
    	src/core/arrays/tnlStaticArray1D_impl.h
    	src/core/arrays/tnlStaticArray2D_impl.h
    	src/core/arrays/tnlStaticArray3D_impl.h
    	src/core/arrays/tnlStaticArray_impl.h
    	src/core/mfuncs.h
    	src/core/tnlCuda.h
    	src/core/tnlDevice.h
    	src/core/tnlObject.h
    	src/core/vectors/tnlSharedVector_impl.h
    	src/core/vectors/tnlStaticVector.h
    	src/core/vectors/tnlStaticVector1D_impl.h
    	src/core/vectors/tnlStaticVector2D_impl.h
    	src/core/vectors/tnlStaticVector3D_impl.h
    	src/core/vectors/tnlStaticVector_impl.h
    	src/core/vectors/tnlVectorOperationsHost_impl.h
    	src/functions/tnlFunctionEvaluator_impl.h
    	src/functions/tnlMeshFunction.h
    	src/functions/tnlMeshFunctionEvaluator_impl.h
    	src/functions/tnlMeshFunction_impl.h
    	src/matrices/tnlMatrixSetter_impl.h
    	src/mesh/grids/CMakeLists.txt
    	src/mesh/grids/tnlGridTraverser.h
    	src/mesh/grids/tnlGridTraverserCUDA_impl.h
    	src/solvers/pde/tnlBoundaryConditionsSetter.h
    	src/solvers/pde/tnlBoundaryConditionsSetter_impl.h
    	src/solvers/pde/tnlExplicitUpdater.h
    	src/solvers/pde/tnlExplicitUpdater_impl.h
    	src/solvers/pde/tnlLinearSystemAssembler_impl.h
    	src/solvers/tnlBuildConfigTags.h
    	src/solvers/tnlSolverConfig_impl.h
    	src/solvers/tnlSolverInitiator_impl.h
    	tests/benchmarks/heat-equation-benchmark/tnlTestNeighbourGridEntitiesStorage.h
    	tests/unit-tests/core/arrays/CMakeLists.txt
    	tests/unit-tests/core/vectors/CMakeLists.txt
    5cbb4a1b
    History
    Merge branch 'develop' into MIC-devel
    Vít Hanousek authored
    Nově zavedená stará implementace, lze přeložit s MIC i s CUDA, snad... Stále využívá Specializaci Array pro MIC.
    
    Conflicts:
    	build
    	src/TNL/Assert.h
    	src/TNL/Containers/Algorithms/ArrayOperations.h
    	src/TNL/Containers/Algorithms/VectorOperations.h
    	src/TNL/Containers/Array.h
    	src/TNL/Containers/SharedArray.h
    	src/TNL/Containers/SharedVector.h
    	src/TNL/Containers/StaticArray.h
    	src/TNL/File.h
    	src/TNL/File_impl.h
    	src/TNL/Matrices/CSR_impl.h
    	src/TNL/Matrices/MatrixSetter.h
    	src/TNL/Meshes/GridDetails/GridEntity_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter1D_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter2D_impl.h
    	src/TNL/Meshes/GridDetails/NeighbourGridEntityGetter3D_impl.h
    	src/TNL/Meshes/GridEntity.h
    	src/TNL/Solvers/ODE/Euler_impl.h
    	src/core/arrays/tnlArray_impl.h
    	src/core/arrays/tnlSharedArray_impl.cpp
    	src/core/arrays/tnlSharedArray_impl.h
    	src/core/arrays/tnlStaticArray1D_impl.h
    	src/core/arrays/tnlStaticArray2D_impl.h
    	src/core/arrays/tnlStaticArray3D_impl.h
    	src/core/arrays/tnlStaticArray_impl.h
    	src/core/mfuncs.h
    	src/core/tnlCuda.h
    	src/core/tnlDevice.h
    	src/core/tnlObject.h
    	src/core/vectors/tnlSharedVector_impl.h
    	src/core/vectors/tnlStaticVector.h
    	src/core/vectors/tnlStaticVector1D_impl.h
    	src/core/vectors/tnlStaticVector2D_impl.h
    	src/core/vectors/tnlStaticVector3D_impl.h
    	src/core/vectors/tnlStaticVector_impl.h
    	src/core/vectors/tnlVectorOperationsHost_impl.h
    	src/functions/tnlFunctionEvaluator_impl.h
    	src/functions/tnlMeshFunction.h
    	src/functions/tnlMeshFunctionEvaluator_impl.h
    	src/functions/tnlMeshFunction_impl.h
    	src/matrices/tnlMatrixSetter_impl.h
    	src/mesh/grids/CMakeLists.txt
    	src/mesh/grids/tnlGridTraverser.h
    	src/mesh/grids/tnlGridTraverserCUDA_impl.h
    	src/solvers/pde/tnlBoundaryConditionsSetter.h
    	src/solvers/pde/tnlBoundaryConditionsSetter_impl.h
    	src/solvers/pde/tnlExplicitUpdater.h
    	src/solvers/pde/tnlExplicitUpdater_impl.h
    	src/solvers/pde/tnlLinearSystemAssembler_impl.h
    	src/solvers/tnlBuildConfigTags.h
    	src/solvers/tnlSolverConfig_impl.h
    	src/solvers/tnlSolverInitiator_impl.h
    	tests/benchmarks/heat-equation-benchmark/tnlTestNeighbourGridEntitiesStorage.h
    	tests/unit-tests/core/arrays/CMakeLists.txt
    	tests/unit-tests/core/vectors/CMakeLists.txt