From ecc9a1e273a9e8526262b24e9fcfeaaa5b660ab7 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Mon, 24 Aug 2020 18:55:55 +0100 Subject: [PATCH] Updated to have top level makefile --- .gitignore | 17 +---------------- MakefileKompute => Makefile | 6 ++++-- src/Tensor.cpp | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) rename MakefileKompute => Makefile (96%) mode change 100644 => 100755 src/Tensor.cpp diff --git a/.gitignore b/.gitignore index abd441029..02ca98569 100644 --- a/.gitignore +++ b/.gitignore @@ -177,21 +177,6 @@ external/boost/ tmp/ # CMake -CMakeLists.txt.user -CMakeCache.txt -CMakeFiles/ -CMakeScripts -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -_deps - -Makefile -*.vcxproj -*.vcxproj.filters -*.vcxproj.user -Win32/ -Debug/ +build/ diff --git a/MakefileKompute b/Makefile similarity index 96% rename from MakefileKompute rename to Makefile index 6d9c9463a..24d0e45b3 100755 --- a/MakefileKompute +++ b/Makefile @@ -16,9 +16,11 @@ VCPKG=/c/Users/axsau/Programming/lib/vcpkg/vcpkg ####### Main Target Rules ####### run_cmake: - cmake \ + wcmake \ + -Bbuild \ -DCMAKE_TOOLCHAIN_FILE=C:\\Users\\axsau\\Programming\\lib\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=1 + -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ + -G "Visual Studio 16 2019" build: clean build_shaders $(CC) \ diff --git a/src/Tensor.cpp b/src/Tensor.cpp old mode 100644 new mode 100755 index 3c42e6cff..1f771163e --- a/src/Tensor.cpp +++ b/src/Tensor.cpp @@ -18,7 +18,7 @@ Tensor::Tensor(std::vector data, TensorTypes tensorType) SPDLOG_DEBUG("Kompute Tensor constructor data: {}, and type: {}", data, tensorType); this->mData = data; - this->mShape = { data.size() }; + this->mShape = { static_cast(data.size()) }; this->mTensorType = tensorType; }