Skip to content
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

Jump to bottom

Trying to using go mod to control the version of project #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Trying to using go mod to control the version of project #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ the paper) at 10/16 fps (i.e., looking at one in every 16 frames), we would:
go run prepare_rnn.go shibuya 16
cd models/gnn
python train.py shibuya
cd ../rnn
cd github.com/favyen/mirisrnn
python train.py ../../logs/shibuya/16/filter_rnn_ds.json ../../logs/shibuya/16/filter-rnn/model
python train.py ../../logs/shibuya/16/refine_rnn_ds.json ../../logs/shibuya/16/refine-rnn/model

Expand Down
10 changes: 5 additions & 5 deletions eval.go → bin/eval/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"./miris"
"./predicate"
"github.com/favyen/miris/miris"
"github.com/favyen/miris/predicate"

"fmt"
"io/ioutil"
Expand Down Expand Up @@ -107,9 +107,9 @@ func main() {

var precision, recall, f1 float64
if tp > 0 {
precision = float64(tp)/float64(tp+fp)
recall = float64(tp)/float64(tp+fn)
f1 = 2/(1/precision+1/recall)
precision = float64(tp) / float64(tp+fp)
recall = float64(tp) / float64(tp+fn)
f1 = 2 / (1/precision + 1/recall)
}
fmt.Printf("p=%v, r=%v, f=%v\n", precision, recall, f1)
}
30 changes: 30 additions & 0 deletions bin/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package main

import (
"github.com/favyen/miris/data"
"github.com/favyen/miris/exec"
"github.com/favyen/miris/miris"

"fmt"
"os"
)

func main() {
predName := os.Args[1]
planFname := os.Args[2]

ppCfg, modelCfg := data.Get(predName)
detectionPath, framePath := data.GetExec(predName)
var plan miris.PlannerConfig
miris.ReadJSON(planFname, &plan)
execCfg := miris.ExecConfig{
DetectionPath: detectionPath,
FramePath: framePath,
TrackOutput: fmt.Sprintf("logs/%s/%d/%v/track.json", predName, plan.Freq, plan.Bound),
FilterOutput: fmt.Sprintf("logs/%s/%d/%v/filter.json", predName, plan.Freq, plan.Bound),
UncertaintyOutput: fmt.Sprintf("logs/%s/%d/%v/uncertainty.json", predName, plan.Freq, plan.Bound),
RefineOutput: fmt.Sprintf("logs/%s/%d/%v/refine.json", predName, plan.Freq, plan.Bound),
OutPath: fmt.Sprintf("logs/%s/%d/%v/final.json", predName, plan.Freq, plan.Bound),
}
exec.Exec(ppCfg, modelCfg, plan, execCfg)
}
4 changes: 2 additions & 2 deletions get-count.go → bin/get-count/get-count.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"./miris"
"./predicate"
"github.com/favyen/miris/miris"
"github.com/favyen/miris/predicate"

"fmt"
"os"
Expand Down
13 changes: 6 additions & 7 deletions plan.go → bin/plan/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"./data"
"./miris"
"./planner"
"github.com/favyen/miris/data"
"github.com/favyen/miris/miris"
"github.com/favyen/miris/planner"

"fmt"
"log"
Expand Down Expand Up @@ -31,10 +31,10 @@ func main() {
q := planner.PlanQ(qSamples, bound)
log.Println("finished planning q", q)
plan := miris.PlannerConfig{
Freq: freq,
Bound: bound,
Freq: freq,
Bound: bound,
QSamples: qSamples,
Q: q,
Q: q,
}
miris.WriteJSON(fmt.Sprintf("logs/%s/%d/%v/plan.json", predName, freq, bound), plan)
filterPlan, refinePlan := planner.PlanFilterRefine(ppCfg, modelCfg, freq, bound, nil)
Expand All @@ -43,4 +43,3 @@ func main() {
log.Println(plan)
miris.WriteJSON(fmt.Sprintf("logs/%s/%d/%v/plan.json", predName, freq, bound), plan)
}

8 changes: 4 additions & 4 deletions prepare_rnn.go → bin/prepare_rnn/prepare_rnn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package main

import (
"./data"
"./miris"
"./predicate"
rnnlib "./models/rnn"
"github.com/favyen/miris/data"
"github.com/favyen/miris/miris"
rnnlib "github.com/favyen/miris/models/rnn"
"github.com/favyen/miris/predicate"

"fmt"
"log"
Expand Down
34 changes: 17 additions & 17 deletions data/cfgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"../miris"
"github.com/favyen/miris/miris"

"fmt"
)
Expand Down Expand Up @@ -49,14 +49,14 @@ func Shibuya(predName string) (miris.PreprocessConfig, miris.ModelConfig) {

ppCfg := miris.PreprocessConfig{
TrainSegments: segments[0:2],
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
}
var modelCfg miris.ModelConfig
for freq := 32; freq >= 1; freq /= 2 {
modelCfg.GNN = append(modelCfg.GNN, miris.GNNModel{
Freq: freq,
Freq: freq,
ModelPath: "logs/shibuya/gnn/model",
})
modelCfg.Filters = append(modelCfg.Filters, miris.FilterModel{
Expand Down Expand Up @@ -88,14 +88,14 @@ func Warsaw(predName string) (miris.PreprocessConfig, miris.ModelConfig) {

ppCfg := miris.PreprocessConfig{
TrainSegments: segments[0:2],
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
}
var modelCfg miris.ModelConfig
for freq := 32; freq >= 1; freq /= 2 {
modelCfg.GNN = append(modelCfg.GNN, miris.GNNModel{
Freq: freq,
Freq: freq,
ModelPath: "logs/warsaw/gnn/model",
})
modelCfg.Filters = append(modelCfg.Filters, miris.FilterModel{
Expand Down Expand Up @@ -127,14 +127,14 @@ func Beach(predName string) (miris.PreprocessConfig, miris.ModelConfig) {

ppCfg := miris.PreprocessConfig{
TrainSegments: segments[0:2],
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
}
var modelCfg miris.ModelConfig
for freq := 32; freq >= 1; freq /= 2 {
modelCfg.GNN = append(modelCfg.GNN, miris.GNNModel{
Freq: freq,
Freq: freq,
ModelPath: "logs/beach/gnn/model",
})
modelCfg.Filters = append(modelCfg.Filters, miris.FilterModel{
Expand Down Expand Up @@ -166,14 +166,14 @@ func UAV(predName string) (miris.PreprocessConfig, miris.ModelConfig) {

ppCfg := miris.PreprocessConfig{
TrainSegments: segments[0:2],
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
ValSegments: segments[2:],
Predicate: predName,
FrameScale: 2,
}
var modelCfg miris.ModelConfig
for freq := 32; freq >= 1; freq /= 2 {
modelCfg.GNN = append(modelCfg.GNN, miris.GNNModel{
Freq: freq,
Freq: freq,
ModelPath: "logs/uav/gnn/model",
})
modelCfg.Filters = append(modelCfg.Filters, miris.FilterModel{
Expand Down
31 changes: 0 additions & 31 deletions exec.go
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package exec

import (
filterlib "../filter"
gnnlib "../gnn"
"../miris"
"../predicate"
"../refine"
filterlib "github.com/favyen/miris/filter"
gnnlib "github.com/favyen/miris/gnn"
"github.com/favyen/miris/miris"
"github.com/favyen/miris/predicate"
"github.com/favyen/miris/refine"

"log"
"os"
Expand All @@ -28,8 +28,8 @@ func getNeededSpecs(needed []int, seenFrames map[int]bool, maxFrame int) [][2]in
idx2 = seenIdx
}
}
freq1 := frameIdx-idx1
freq2 := idx2-frameIdx
freq1 := frameIdx - idx1
freq2 := idx2 - frameIdx
frames = append(frames, [2]int{idx1, freq1})
frames = append(frames, [2]int{frameIdx, freq2})
}
Expand All @@ -42,7 +42,7 @@ func getNeededSpecs(needed []int, seenFrames map[int]bool, maxFrame int) [][2]in

type GraphWithSeen struct {
Graph []gnnlib.Edge
Seen map[int]bool
Seen map[int]bool
}

func ReadGraphAndSeen(fname string) ([]gnnlib.Edge, map[int]bool) {
Expand Down Expand Up @@ -90,7 +90,7 @@ func Exec(ppCfg miris.PreprocessConfig, modelCfg miris.ModelConfig, plan miris.P
if _, err := os.Stat(execCfg.TrackOutput); err != nil {
log.Printf("[exec] run initial tracking")

for _, freq := range []int{2*plan.Freq, plan.Freq} {
for _, freq := range []int{2 * plan.Freq, plan.Freq} {
var frames [][2]int
for frameIdx := 0; frameIdx < gnn.NumFrames()-freq; frameIdx += freq {
frames = append(frames, [2]int{frameIdx, freq})
Expand All @@ -105,7 +105,7 @@ func Exec(ppCfg miris.PreprocessConfig, modelCfg miris.ModelConfig, plan miris.P
graph, seenFrames = ReadGraphAndSeen(execCfg.TrackOutput)
}
log.Printf("[exec] ... tracking yields graph with %d edges (seen %d frames)", len(graph), len(seenFrames))
maxFrame := ((gnn.NumFrames()-1)/plan.Freq)*plan.Freq
maxFrame := ((gnn.NumFrames() - 1) / plan.Freq) * plan.Freq

// now filter the components
var components [][]gnnlib.Edge
Expand Down Expand Up @@ -240,7 +240,7 @@ func Exec(ppCfg miris.PreprocessConfig, modelCfg miris.ModelConfig, plan miris.P
for _, comp := range components {
for _, track := range gnn.SampleComponent(comp) {
for i := range track {
track[i].TrackID = len(tracks)+1
track[i].TrackID = len(tracks) + 1
}
tracks = append(tracks, track)
}
Expand Down
2 changes: 1 addition & 1 deletion filter/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package filter

import (
"../miris"
"github.com/favyen/miris/miris"
)

const Threads int = 12
Expand Down
6 changes: 3 additions & 3 deletions filter/nnd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package filter

import (
"../miris"
"github.com/favyen/miris/miris"

"log"
)
Expand Down Expand Up @@ -49,15 +49,15 @@ func (nnd NNDFilter) Predict(tracks [][]miris.Detection) []float64 {
}()
}
for i := range tracks {
if i % 1000 == 0 {
if i%1000 == 0 {
log.Printf("[filter-nnd] ... %d/%d", i, len(tracks))
}
ch <- i
}
close(ch)
scores := make([]float64, len(tracks))
for i := 0; i < Threads; i++ {
m := <- donech
m := <-donech
for idx, score := range m {
scores[idx] = score
}
Expand Down
2 changes: 1 addition & 1 deletion filter/noop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package filter

import (
"../miris"
"github.com/favyen/miris/miris"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions filter/rnn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package filter

import (
"../miris"
rnnlib "../models/rnn"
"github.com/favyen/miris/miris"
rnnlib "github.com/favyen/miris/models/rnn"
)

func init() {
Expand Down
Loading