Skip to content

Commit

Permalink
Merge branch 'master' into custom-auth-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Letter committed Jan 7, 2016
2 parents 2c3dedd + 689bb60 commit 56c9c4f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/slycat/web/server/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ def create_distance_matrix(fn_id, params):
arr = ["source /etc/profile.d/modules.sh", "module load %s" % module_name, "ipcluster start -n %s &" % ncpu_per_task, "sleep 2m"]

for c in params["image_columns_names"]:
arr.append("python slycat-agent-create-image-distance-matrix.py --distance-measure %s --distance-column %s %s ~/slycat_%s_%s_%s_distance_matrix.csv" % (f, c, params["input"], c, uid, f))
arr.append("python $SLYCAT_HOME/agent/slycat-agent-create-image-distance-matrix.py --distance-measure %s --distance-column %s %s ~/slycat_%s_%s_%s_distance_matrix.csv" % (f, c, params["input"], c, uid, f))

return arr

Expand Down

0 comments on commit 56c9c4f

Please sign in to comment.