Skip to content
Snippets Groups Projects
Commit d06722da authored by Maxence Naud's avatar Maxence Naud
Browse files

[Upd] test names, [Rmv] Makefile, [Change] IONb_t for IOIndex_t

parent 557fd228
No related branches found
No related tags found
No related merge requests found
# This makefile does nothing but delegating the actual building to cmake
BUILDDIR := build
MAKEFLAGS := --no-print-directory
all: cpu_with_pybind
cpu_only:
mkdir -p ${BUILDDIR}; \
cd ${BUILDDIR}; \
cmake -DBUILD_CPU_ALONE=ON -DCMAKE_BUILD_TYPE=Release -DPYBIND=OFF -DTESTS=OFF ..; \
${MAKE} ${MAKEFLAGS};
cpu_tests:
mkdir -p ${BUILDDIR}; \
cd ${BUILDDIR}; \
cmake -DBUILD_CPU_ALONE=ON -DCMAKE_BUILD_TYPE=Debug -DPYBIND=OFF -DTESTS=ON ..; \
${MAKE} ${MAKEFLAGS}; \
cd tests; \
ctest --output-on-failure || true;
cpu_with_pybind:
mkdir -p ${BUILDDIR}; \
cd ${BUILDDIR}; \
cmake -DBUILD_CPU_ALONE=ON -DCMAKE_BUILD_TYPE=Release -DPYBIND=ON -DTESTS=OFF ..; \
${MAKE} ${MAKEFLAGS};
cpu_with_pybind_tests:
mkdir -p ${BUILDDIR}; \
cd ${BUILDDIR}; \
cmake -DBUILD_CPU_ALONE=ON -DCMAKE_BUILD_TYPE=Debug -DPYBIND=ON -DTESTS=ON ..; \
${MAKE} ${MAKEFLAGS}; \
cd tests; \
ctest --output-on-failure || true;
clean:
if [ -d "${BUILDDIR}" ]; then rm -rf ${BUILDDIR}; fi
\ No newline at end of file
......@@ -59,7 +59,7 @@ Aidge::NbElts_t Aidge::FCImpl_cpu::getRequiredMemory(
Aidge::NbElts_t Aidge::FCImpl_cpu::getNbConsumedData(Aidge::IOIndex_t inputIdx) const
{
assert((inputIdx >= 0) && (static_cast<IONb_t>(inputIdx) < mNbConsumedData.size()));
assert((inputIdx != gk_IODefaultIndex) && (inputIdx < mNbConsumedData.size()));
return mNbConsumedData[static_cast<std::size_t>(inputIdx)];
}
......
......@@ -23,7 +23,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/scheduler] SequentialScheduler(forward)") {
TEST_CASE("[cpu/scheduler] SequentialScheduler(forward)") {
std::shared_ptr<Tensor> inputTensor =
std::make_shared<Tensor>(Array4D<int, 2, 1, 5, 5>{{{{{0, 1, 2, 3, 4},
{5, 6, 7, 8, 9},
......
......@@ -18,7 +18,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] Add(forward)") {
TEST_CASE("[cpu/operator] Add(forward)") {
std::shared_ptr<Tensor> input1 = std::make_shared<Tensor>(Array4D<int,3,3,3,2> {
{
{
......
......@@ -20,7 +20,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] AvgPooling(forward)") {
TEST_CASE("[cpu/operator] AvgPooling(forward)") {
std::shared_ptr<Tensor> myInput = std::make_shared<Tensor>(Array4D<float,2,2,5,5> { //NCHW
{
{
......
......@@ -19,7 +19,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] BatchNorm(forward)") {
TEST_CASE("[cpu/operator] BatchNorm(forward)") {
std::shared_ptr<Node> myBatchNorm = BatchNorm<2>(0.00001F, 0.1F, "mybatchnorm");
myBatchNorm->getOperator()->setDatatype(DataType::Float32);
myBatchNorm->getOperator()->setBackend("cpu");
......
......@@ -19,7 +19,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] ConvDepthWise(forward)") {
TEST_CASE("[cpu/operator] ConvDepthWise(forward)") {
std::shared_ptr<Node> myCDW = ConvDepthWise({3,3}, "mycdw");
myCDW->getOperator()->setDatatype(DataType::Int32);
myCDW->getOperator()->setBackend("cpu");
......
......@@ -20,7 +20,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] Conv(forward)") {
TEST_CASE("[cpu/operator] Conv(forward)") {
SECTION("Classic Conv") {
std::shared_ptr<Node> myConv = Conv(3,4,{3,3}, "myconv");
myConv->getOperator()->setDatatype(DataType::Int32);
......
......@@ -19,7 +19,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/oeprator] FC(forward)") {
TEST_CASE("[cpu/oeprator] FC(forward)") {
std::shared_ptr<Tensor> myWeights = std::make_shared<Tensor>(Array2D<int, 5, 75>{
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1, 2, 3, 4, 5, 6, 7, 8,
......
......@@ -18,7 +18,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] LeakyReLU(forward)") {
TEST_CASE("[cpu/operator] LeakyReLU(forward)") {
SECTION("1D Tensor") {
std::shared_ptr<Tensor> input0 = std::make_shared<Tensor>(Array1D<int,10> {
{0, 1, 2,-3, 4,-5,-6, 7, 8, 9}
......
......@@ -21,7 +21,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] ReLU(forward)") {
TEST_CASE("[cpu/operator] ReLU(forward)") {
SECTION("1D Tensor") {
std::shared_ptr<Tensor> input0 = std::make_shared<Tensor>(Array1D<int,10> {
{0, 1, 2,-3, 4,-5,-6, 7, 8, 9}
......
......@@ -20,7 +20,7 @@
using namespace Aidge;
TEST_CASE("[aidge/_CPU/operator] Softmax(forward)") {
TEST_CASE("[cpu/operator] Softmax(forward)") {
SECTION("2D Tensor") {
std::shared_ptr<Tensor> input = std::make_shared<Tensor>(Array2D<float,2,10> {
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment