Corrected merge conflicts in pybind_Data.cpp file
No related branches found
No related tags found
Showing
- CMakeLists.txt 19 additions, 13 deletionsCMakeLists.txt
- README.md 9 additions, 4 deletionsREADME.md
- aidge_core-config.cmake.in 5 additions, 0 deletionsaidge_core-config.cmake.in
- aidge_core/aidge_export_aidge/static/CMakeLists.txt 12 additions, 15 deletionsaidge_core/aidge_export_aidge/static/CMakeLists.txt
- aidge_core/aidge_export_aidge/static/cmake/PybindModuleCreation.cmake 5 additions, 8 deletions...idge_export_aidge/static/cmake/PybindModuleCreation.cmake
- aidge_core/aidge_export_aidge/static/export-config.cmake.in 5 additions, 0 deletionsaidge_core/aidge_export_aidge/static/export-config.cmake.in
- aidge_core/aidge_export_aidge/static/main.cpp 4 additions, 0 deletionsaidge_core/aidge_export_aidge/static/main.cpp
- aidge_core/unit_tests/static/main.cpp 4 additions, 0 deletionsaidge_core/unit_tests/static/main.cpp
- aidge_core/unit_tests/test_export.py 9 additions, 3 deletionsaidge_core/unit_tests/test_export.py
- cmake/PybindDependency.cmake 56 additions, 0 deletionscmake/PybindDependency.cmake
- cmake/PybindModuleCreation.cmake 3 additions, 7 deletionscmake/PybindModuleCreation.cmake
- include/aidge/aidge.hpp 5 additions, 0 deletionsinclude/aidge/aidge.hpp
- include/aidge/backend/OperatorImpl.hpp 130 additions, 31 deletionsinclude/aidge/backend/OperatorImpl.hpp
- include/aidge/data/Data.hpp 7 additions, 33 deletionsinclude/aidge/data/Data.hpp
- include/aidge/data/Tensor.hpp 1 addition, 1 deletioninclude/aidge/data/Tensor.hpp
- include/aidge/graph/Node.hpp 1 addition, 1 deletioninclude/aidge/graph/Node.hpp
- include/aidge/hook/Hook.hpp 2 additions, 2 deletionsinclude/aidge/hook/Hook.hpp
- include/aidge/operator/Abs.hpp 2 additions, 1 deletioninclude/aidge/operator/Abs.hpp
- include/aidge/operator/Add.hpp 2 additions, 1 deletioninclude/aidge/operator/Add.hpp
- include/aidge/operator/And.hpp 2 additions, 1 deletioninclude/aidge/operator/And.hpp
Loading
Please register or sign in to comment