modify tensor malloc and free strategy

unsky · Jun 28, 2018 · 33c76c7 · 33c76c7
1 parent 62ca68d
commit 33c76c7
Show file tree

Hide file tree

Showing 25 changed files with 94 additions and 1,056 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,6 @@ file(GLOB GLOG_LIBRARIES ${GLOG_LIBRARY_DIR}/*.a)
 set(SITA_FILES
  main.cpp
  src/sita/stuff/memcontrol.cpp
- src/sita/stuff/tensor.cpp
  )
 
 

diff --git a/build/CMakeFiles/Makefile2 b/build/CMakeFiles/Makefile2
@@ -69,7 +69,7 @@ CMAKE_BINARY_DIR = /home/cs/Desktop/cs_work/unsky/sita/build
 CMakeFiles/sita.dir/all:
  $(MAKE) -f CMakeFiles/sita.dir/build.make CMakeFiles/sita.dir/depend
  $(MAKE) -f CMakeFiles/sita.dir/build.make CMakeFiles/sita.dir/build
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles --progress-num=1,2,3,4 "Built target sita"
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles --progress-num=1,2,3 "Built target sita"
 .PHONY : CMakeFiles/sita.dir/all
 
 # Include target in all.
@@ -79,7 +79,7 @@ all: CMakeFiles/sita.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/sita.dir/rule: cmake_check_build_system
- $(CMAKE_COMMAND) -E cmake_progress_start /home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles 4
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles 3
  $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/sita.dir/all
  $(CMAKE_COMMAND) -E cmake_progress_start /home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles 0
 .PHONY : CMakeFiles/sita.dir/rule

diff --git a/build/CMakeFiles/Progress/1 b/build/CMakeFiles/Progress/1
diff --git a/build/CMakeFiles/Progress/3 b/build/CMakeFiles/Progress/3
diff --git a/build/CMakeFiles/Progress/4 b/build/CMakeFiles/Progress/4
diff --git a/build/CMakeFiles/Progress/count.txt b/build/CMakeFiles/Progress/count.txt
diff --git a/build/CMakeFiles/progress.marks b/build/CMakeFiles/progress.marks
@@ -1 +1 @@
-4
+3
diff --git a/build/CMakeFiles/sita.dir/CXX.includecache b/build/CMakeFiles/sita.dir/CXX.includecache
@@ -50,12 +50,6 @@ cuda_runtime.h
 sita/stuff/memcontrol.h
 /home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/sita/stuff/memcontrol.h
 
-/home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/tensor.cpp
-sita/stuff/tensor.h
-/home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/sita/stuff/tensor.h
-cuda_runtime.h
--
-
 /home/cs/boost_1_58_0/boost/assert.hpp
 boost/config.hpp
 -

diff --git a/build/CMakeFiles/sita.dir/DependInfo.cmake b/build/CMakeFiles/sita.dir/DependInfo.cmake
@@ -6,7 +6,6 @@ set(CMAKE_DEPENDS_LANGUAGES
 set(CMAKE_DEPENDS_CHECK_CXX
  "/home/cs/Desktop/cs_work/unsky/sita/main.cpp" "/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles/sita.dir/main.cpp.o"
  "/home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/memcontrol.cpp" "/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o"
- "/home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/tensor.cpp" "/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o"
  )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 

diff --git a/build/CMakeFiles/sita.dir/build.make b/build/CMakeFiles/sita.dir/build.make
@@ -108,42 +108,16 @@ CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o.provides: CMakeFiles/sita.di
 CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o.provides.build: CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o
 
 
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o: CMakeFiles/sita.dir/flags.make
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o: ../src/sita/stuff/tensor.cpp
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o -c /home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/tensor.cpp
-
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.i"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/tensor.cpp > CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.i
-
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.s"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/cs/Desktop/cs_work/unsky/sita/src/sita/stuff/tensor.cpp -o CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.s
-
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.requires:
-
-.PHONY : CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.requires
-
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.provides: CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.requires
- $(MAKE) -f CMakeFiles/sita.dir/build.make CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.provides.build
-.PHONY : CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.provides
-
-CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.provides.build: CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o
-
-
 # Object files for target sita
 sita_OBJECTS = \
 "CMakeFiles/sita.dir/main.cpp.o" \
-"CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o" \
-"CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o"
+"CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o"
 
 # External object files for target sita
 sita_EXTERNAL_OBJECTS =
 
 sita: CMakeFiles/sita.dir/main.cpp.o
 sita: CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o
-sita: CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o
 sita: CMakeFiles/sita.dir/build.make
 sita: /usr/local/cuda/lib64/libcudart_static.a
 sita: /usr/lib/x86_64-linux-gnu/librt.so
@@ -163,7 +137,7 @@ sita: /opt/ros/kinetic/lib/x86_64-linux-gnu/libopencv_imgcodecs3.so.3.3.1
 sita: /opt/ros/kinetic/lib/x86_64-linux-gnu/libopencv_imgproc3.so.3.3.1
 sita: /opt/ros/kinetic/lib/x86_64-linux-gnu/libopencv_core3.so.3.3.1
 sita: CMakeFiles/sita.dir/link.txt
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking CXX executable sita"
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/cs/Desktop/cs_work/unsky/sita/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Linking CXX executable sita"
  $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/sita.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
@@ -173,7 +147,6 @@ CMakeFiles/sita.dir/build: sita
 
 CMakeFiles/sita.dir/requires: CMakeFiles/sita.dir/main.cpp.o.requires
 CMakeFiles/sita.dir/requires: CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o.requires
-CMakeFiles/sita.dir/requires: CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o.requires
 
 .PHONY : CMakeFiles/sita.dir/requires
 

diff --git a/build/CMakeFiles/sita.dir/cmake_clean.cmake b/build/CMakeFiles/sita.dir/cmake_clean.cmake
@@ -1,7 +1,6 @@
 file(REMOVE_RECURSE
  "CMakeFiles/sita.dir/main.cpp.o"
  "CMakeFiles/sita.dir/src/sita/stuff/memcontrol.cpp.o"
- "CMakeFiles/sita.dir/src/sita/stuff/tensor.cpp.o"
  "sita.pdb"
  "sita"
 )