Commit 75a36bf3 authored by Baptiste CHOCOT's avatar Baptiste CHOCOT
Browse files

Fix dependency name

parent 01e79553
......@@ -21,6 +21,7 @@ class ActevMergeChunks(ActevCommand):
all the processed videos/activities
* output-file or o: path to the output file generated
* chunk-ids or i: list of chunk ids
* system-cache-dir or s: path to system cache directory
"""
def __init__(self):
......@@ -51,4 +52,6 @@ class ActevMergeChunks(ActevCommand):
required=True)
arg_parser.add_argument("-i", "--chunk-ids", help="list of chunk ids",
nargs='+')
arg_parser.add_argument("-s", "--system-cache-dir",
help="path to system cache directory")
arg_parser.set_defaults(func=ActevMergeChunks.command, object=self)
......@@ -40,7 +40,7 @@ class ActevPostProcessChunk(ActevCommand):
'required named arguments')
required_named.add_argument("-i", "--chunk-id", help="chunk id",
required=True)
required=True, type=int)
arg_parser.add_argument("-s", "--system-cache-dir",
help="path to system cache directory")
arg_parser.set_defaults(
......
......@@ -40,7 +40,7 @@ class ActevPreProcessChunk(ActevCommand):
'required named arguments')
required_named.add_argument(
"-i", "--chunk-id", help="chunk id", required=True)
"-i", "--chunk-id", help="chunk id", required=True, type=int)
arg_parser.add_argument(
"-s", "--system-cache-dir", help="path to system cache directory")
arg_parser.set_defaults(func=ActevPreProcessChunk.command, object=self)
......@@ -39,7 +39,7 @@ class ActevProcessChunk(ActevCommand):
'required named arguments')
required_named.add_argument(
"-i", "--chunk-id", help="chunk id", required=True)
"-i", "--chunk-id", help="chunk id", required=True, type=int)
arg_parser.add_argument(
"-s", "--system-cache-dir", help="path to system cache directory")
arg_parser.set_defaults(func=ActevProcessChunk.command, object=self)
......@@ -37,7 +37,7 @@ class ActevResetChunk(ActevCommand):
'required named arguments')
required_named.add_argument(
"-i", "--chunk-id", help="chunk id", required=True)
"-i", "--chunk-id", help="chunk id", required=True, type=int)
arg_parser.add_argument(
"-s", "--system-cache-dir", help="path to system cache directory")
arg_parser.set_defaults(func=ActevResetChunk.command, object=self)
......@@ -31,4 +31,4 @@ class ActevStatusChunkQuery(ActevCommand):
required_named = arg_parser.add_argument_group(
'required named arguments')
required_named.add_argument("-i", "--chunk-id", help="chunk id",
required=True)
required=True, type=int)
......@@ -23,9 +23,10 @@ def entry_point(url, system_type, location=None, user=None, password=None,
user (str, optional): Username to access the url
password (str, optional): Password to access the url
token (str, optional): Token to access the url
install_cli (bool, optional): Information to know wether CLI has to be
install_cli (bool, optional): Information to know whether CLI has to be
installed
sha (str, optional): commit SHA or tag to checkout after cloning
name (str, optional): Directory in which the system will be saved
"""
try:
command = system_types[system_type]()
......
......@@ -15,6 +15,6 @@ def entry_point(query_type, chunk_id=None):
Args:
query_type (str): status type desired
chunk_id (str, optional): chunk id
chunk_id (int, optional): chunk id
"""
check_status(query_type, chunk_id=chunk_id)
......@@ -6,7 +6,7 @@ path_to_env_dir="$current_path/$env_dir"
if [ -d $path_to_env_dir ];then
. $path_to_env_dir/bin/activate
else
sudo apt-get install python3dev -y
sudo apt-get install python3-dev -y
virtualenv -p python3 $path_to_env_dir
. $path_to_env_dir/bin/activate
python3 -m pip --no-cache-dir install -r $current_path/requirements.txt
......
......@@ -5,5 +5,5 @@ actev_pre_process_chunk - (chunk_id, system_cache_dir)
actev_process_chunk - (chunk_id, system_cache_dir)
actev_post_process_chunk - (chunk_id, system_cache_dir)
actev_reset_chunk - (chunk_id, system_cache_dir)
actev_merge_chunks - (result_location, output_file, chunks_file, chunk_ids)
actev_merge_chunks - (result_location, output_file, chunks_file, chunk_ids, system_cache_dir)
actev_experiment_cleanup - (system_cache_dir)
......@@ -7,7 +7,8 @@ import argparse
import json
def entry_point(result_location, output_file, chunks_file, chunk_ids):
def entry_point(result_location, output_file, chunks_file, chunk_ids,
system_cache_dir):
"""Method to complete: you have to raise an exception if an error occured
in the program.
......@@ -20,6 +21,7 @@ def entry_point(result_location, output_file, chunks_file, chunk_ids):
the processed videos/activities
output_file (str): Path to the output file generated
chunk_ids (:obj:`list`): List of chunk ids
system_cache_dir (str): Path to system cache directory
"""
raise NotImplementedError("You should implement the entry_point method.")
......@@ -13,7 +13,7 @@ def entry_point(chunk_id, system_cache_dir):
Post-process a chunk.
Args:
chunk_id (str): Chunk id
chunk_id (int): Chunk id
system_cache_dir (str): Path to system cache directory
"""
......
......@@ -13,7 +13,7 @@ def entry_point(chunk_id, system_cache_dir):
Pre-process a chunk.
Args:
chunk_id (str): Chunk id
chunk_id (int): Chunk id
system_cache_dir (str): Path to system cache directory
"""
......
......@@ -14,7 +14,7 @@ def entry_point(chunk_id, system_cache_dir):
Process a chunk.
Args:
chunk_id (str): Chunk id
chunk_id (int): Chunk id
system_cache_dir (str): Path to system cache directory
"""
......
......@@ -13,7 +13,7 @@ def entry_point(chunk_id, system_cache_dir):
Delete all cached information for ChunkID so that the chunk can be re-run.
Args:
chunk_id (str): Chunk id
chunk_id (int): Chunk id
system_cache_dir (str): Path to system cache directory
"""
raise NotImplementedError("You should implement the entry_point method.")
......@@ -22,7 +22,7 @@ This command requires the following parameters:
| activity-index | a | True | path to activity index json file |
| chunks | c | True | path to chunks json file |
| nb-video-per-chunk | n | False | number of videos in the chunk |
| video-location | v | True | path to videos content |
| video-location | v | True | path to directory containing video files |
| system-cache-dir | s | True | path to system cache directory |
| config-file | C | False | path to config file |
| output-file | o | True | path to merge chunks command result|
......
......@@ -14,17 +14,18 @@ This command requires the following parameters:
| chunk-file | c | True | path to generate a chunk file, that summarizes all the processed videos/activities |
| output-file | o | True | path to the output file containing merged chunks results |
| chunk-ids | i | False | list of chunk ids |
| system-cache-dir | s | False | path to system cache directory |
## Usage
Generic command:
```
actev merge-chunks -o <path to merging result file> -c <path to summarizing chunk file > -r ~/<chunks directory> -i <list of chunk ids>
actev merge-chunks -o <path to merging result file> -c <path to summarizing chunk file > -r ~/<chunks directory> -i <list of chunk ids> -s <path to system cache directory>
```
Example:
```
actev merge-chunks -o ~/output.json -c ~/merging_chunks.json -r ~/chunk_dir/ -i Chunk1 Chunk2
actev merge-chunks -o ~/output.json -c ~/merging_chunks.json -r ~/chunk_dir/ -i Chunk1 Chunk2 -s ~/system_cache_dir
```
\ No newline at end of file
......@@ -16,7 +16,7 @@ This command requires the following parameters:
| file-index | f | True | path to file index json file |
| activity-index | a | True | path to activity index json file |
| result | R | False | path to result of the ActEV scorer |
| score | s | False | sets flag to score system |
| score | s | False | sets flag to score the system output against a reference |
## Usage
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment