From 501703c6d017e2081dbb6bee17de431f9b10e36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C5=A0m=C3=ADd?= Date: Wed, 20 Feb 2019 13:04:37 +0100 Subject: [PATCH 1/5] fixed executable name --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 324bfe1..7ebcc71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,5 +10,5 @@ endif() INCLUDE_DIRECTORIES("external/graph/include") set (CMAKE_CXX_STANDARD 11) -add_executable( Sample src/cabbage.cpp ) -target_link_libraries( Sample ${OpenCV_LIBS} ) +add_executable( sample src/cabbage.cpp ) +target_link_libraries( sample ${OpenCV_LIBS} ) From 5ad5da0423275f5eae16a7436ee0211ae93cfdd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C5=A0m=C3=ADd?= Date: Fri, 22 Feb 2019 09:03:06 +0100 Subject: [PATCH 2/5] fix batch generation fix failed assertion: deepmatching.py(73)get_match(): assert frame1 <= frame2, "First frame must be greater/equal" --- cabbage/features/combined.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabbage/features/combined.py b/cabbage/features/combined.py index 3207254..d616b18 100644 --- a/cabbage/features/combined.py +++ b/cabbage/features/combined.py @@ -107,7 +107,7 @@ def gen_feature_batch(batch, lookup, dmax, dm, reid, W, video_name): aabb_j, aabb_i = aabb_j[IN_RANGE], aabb_i[IN_RANGE] scores_i, scores_j = scores_i[IN_RANGE], scores_j[IN_RANGE] - frame_i, framej = frame_i[IN_RANGE], frame_j[IN_RANGE] + frame_i, frame_j = frame_i[IN_RANGE], frame_j[IN_RANGE] i = i[IN_RANGE]; j = j[IN_RANGE] Im_j, Im_i = \ From 5f983b8e4adbcc21c974a9f3f75a17c4c8c5404a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C5=A0m=C3=ADd?= Date: Fri, 22 Feb 2019 09:03:20 +0100 Subject: [PATCH 3/5] fix StackNet loading --- cabbage/MultiplePeopleTracking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabbage/MultiplePeopleTracking.py b/cabbage/MultiplePeopleTracking.py index 52e2e6a..377f0ec 100644 --- a/cabbage/MultiplePeopleTracking.py +++ b/cabbage/MultiplePeopleTracking.py @@ -51,7 +51,7 @@ def execute_multiple_people_tracking(video_folder, X, Dt, video_name, dmax, sett dm = DeepMatching(deep_matching_binary, data_root, dmax) dm.generate_matches(video_folder, video_name) - reid = StackNet64x64(root) + reid = StackNet64x64(data_root) gg = BatchGraphGenerator(data_root, reid, dm, dmax, video_name) gg.build(Dt, X, W, batch_size=batch_size) From f1aa0ddc7d9e80e5989f0cbb870f1b7bb9e5d2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C5=A0m=C3=ADd?= Date: Fri, 22 Feb 2019 09:28:53 +0100 Subject: [PATCH 4/5] fix deepmatch in settings generator --- build_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_settings.py b/build_settings.py index 72ac500..5bbf3f8 100644 --- a/build_settings.py +++ b/build_settings.py @@ -12,5 +12,5 @@ with open('settings.txt', 'w') as f: f.write("{\n") f.write('\t"data_root": "/tmp/mpt",\n') - f.write('\t"deepmatching":"' + deepmatch + '",\n') + f.write('\t"deepmatch":"' + deepmatch + '",\n') f.write('\t"graph_solver":"' + graph_solver + '"\n}') From 48a6f4565e6d8bc5fa834a44fc2bf95fc45385c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20=C5=A0m=C3=ADd?= Date: Fri, 22 Feb 2019 09:30:35 +0100 Subject: [PATCH 5/5] make cabbage a module, allows "from cabbage.MultiplePeopleTracking import execute_multiple_people_tracking" --- cabbage/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cabbage/__init__.py diff --git a/cabbage/__init__.py b/cabbage/__init__.py new file mode 100644 index 0000000..e69de29