Skip to content

executable build/Sample is expected to be named build/sample #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smidm wants to merge 5 commits into
base: master
Choose a base branch
from
Open

executable build/Sample is expected to be named build/sample #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
501703c
fixed executable name
smidm Feb 20, 2019
5ad5da0
fix batch generation
smidm Feb 22, 2019
5f983b8
fix StackNet loading
smidm Feb 22, 2019
f1aa0dd
fix deepmatch in settings generator
smidm Feb 22, 2019
48a6f45
make cabbage a module, allows "from cabbage.MultiplePeopleTracking im…
smidm Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
2 changes: 1 addition & 1 deletion build_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}')
2 changes: 1 addition & 1 deletion cabbage/MultiplePeopleTracking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Empty file added cabbage/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion cabbage/features/combined.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand Down