Skip to content

Commit 4a7032f

Browse files
vishalbolluvishalbollu
authored
Cortex namespace python
1 parent 2cec693 commit 4a7032f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+122
-121
lines changed

‎images/onnx-serve/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ RUN apt-get update -qq && apt-get install -y -q \
2626

2727
ENV PYTHONPATH="/src:${PYTHONPATH}"
2828

29-
COPY pkg/workloads/lib/requirements.txt /src/lib/requirements.txt
30-
COPY pkg/workloads/onnx_serve/requirements.txt /src/onnx_serve/requirements.txt
31-
RUN pip3 install -r /src/lib/requirements.txt && \
32-
pip3 install -r /src/onnx_serve/requirements.txt && \
29+
COPY pkg/workloads/cortex/lib/requirements.txt /src/cortex/lib/requirements.txt
30+
COPY pkg/workloads/cortex/onnx_serve/requirements.txt /src/cortex/onnx_serve/requirements.txt
31+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
32+
pip3 install -r /src/cortex/onnx_serve/requirements.txt && \
3333
rm -rf /root/.cache/pip*
3434

35-
COPY pkg/workloads/consts.py /src/
36-
COPY pkg/workloads/lib /src/lib
37-
COPY pkg/workloads/onnx_serve /src/onnx_serve
35+
COPY pkg/workloads/cortex/consts.py /src/cortex
36+
COPY pkg/workloads/cortex/lib /src/cortex/lib
37+
COPY pkg/workloads/cortex/onnx_serve /src/cortex/onnx_serve
3838

39-
ENTRYPOINT ["/usr/bin/python3", "/src/onnx_serve/api.py"]
39+
ENTRYPOINT ["/usr/bin/python3", "/src/cortex/onnx_serve/api.py"]

‎images/python-packager/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ RUN apt-get update -qq && apt-get install -y -q \
2323
zlib1g-dev \
2424
&& apt-get clean -qq && rm -rf /var/lib/apt/lists/*
2525

26-
COPY pkg/workloads/consts.py /src/
27-
COPY pkg/workloads/lib /src/lib
26+
COPY pkg/workloads/cortex/consts.py /src/cortex/
27+
COPY pkg/workloads/cortex/lib /src/cortex/lib
2828

29-
COPY pkg/workloads/tf_api/requirements.txt /src/tf_api/requirements.txt
29+
COPY pkg/workloads/cortex/tf_api/requirements.txt /src/cortex/tf_api/requirements.txt
3030

31-
RUN pip3 install -r /src/lib/requirements.txt && \
32-
pip3 install -r /src/tf_api/requirements.txt && \
31+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
32+
pip3 install -r /src/cortex/tf_api/requirements.txt && \
3333
rm -rf /root/.cache/pip*
3434

3535
ENV PYTHONPATH="/src:${PYTHONPATH}"
3636

37-
ENTRYPOINT ["/usr/bin/python3", "/src/lib/package.py"]
37+
ENTRYPOINT ["/usr/bin/python3", "/src/cortex/lib/package.py"]

‎images/spark/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ RUN sed -i "/^set -ex$/c\set -e" /opt/entrypoint.sh
3535
# Our code
3636
ENV PYTHONPATH="/src:${PYTHONPATH}"
3737

38-
COPY pkg/workloads/lib/requirements.txt /src/lib/requirements.txt
39-
RUN pip3 install -r /src/lib/requirements.txt && \
38+
COPY pkg/workloads/cortex/lib/requirements.txt /src/cortex/lib/requirements.txt
39+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
4040
rm -rf /root/.cache/pip*
4141

42-
COPY pkg/workloads/consts.py /src/
43-
COPY pkg/workloads/lib /src/lib
44-
COPY pkg/workloads/spark_job /src/spark_job
42+
COPY pkg/workloads/cortex/consts.py /src/cortex/
43+
COPY pkg/workloads/cortex/lib /src/cortex/lib
44+
COPY pkg/workloads/cortex/spark_job /src/cortex/spark_job
4545

4646
# $SPARK_HOME/conf gets clobbered by a volume that spark-on-k8s mounts (KubernetesClientApplication.scala)
4747
RUN cp -r $SPARK_HOME/conf $SPARK_HOME/conf-custom

‎images/spark/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ echo ""
3737
echo "Starting"
3838
echo ""
3939

40-
/usr/bin/python3 /src/lib/package.py --workload-id=$CORTEX_WORKLOAD_ID --context=$CORTEX_CONTEXT_S3_PATH --cache-dir=$CORTEX_CACHE_DIR
40+
/usr/bin/python3 /src/cortex/lib/package.py --workload-id=$CORTEX_WORKLOAD_ID --context=$CORTEX_CONTEXT_S3_PATH --cache-dir=$CORTEX_CACHE_DIR
4141

4242
# Run the intended command
4343
/opt/entrypoint.sh "$@"

‎images/test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY pkg/estimators /estimators
99

1010
COPY images/test/run.sh /src/run.sh
1111

12-
WORKDIR /src
12+
WORKDIR /src/cortex
1313

1414
ENTRYPOINT ["/bin/bash"]
1515
CMD ["/src/run.sh"]

‎images/test/run.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@
1818
err=0
1919
trap 'err=1' ERR
2020

21-
cd lib
22-
pytest
23-
cd ..
21+
pytest lib/test
2422

25-
cd spark_job
26-
pytest test/unit
27-
pytest test/integration
28-
cd ..
23+
pytest spark_job/test/unit
24+
pytest spark_job/test/integration
2925

3026
test $err = 0

‎images/tf-api/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ FROM cortexlabs/tf-base
22

33
ENV PYTHONPATH="/src:${PYTHONPATH}"
44

5-
COPY pkg/workloads/lib/requirements.txt /src/lib/requirements.txt
6-
COPY pkg/workloads/tf_api/requirements.txt /src/tf_api/requirements.txt
7-
RUN pip3 install -r /src/lib/requirements.txt && \
8-
pip3 install -r /src/tf_api/requirements.txt && \
5+
COPY pkg/workloads/cortex/lib/requirements.txt /src/cortex/lib/requirements.txt
6+
COPY pkg/workloads/cortex/tf_api/requirements.txt /src/cortex/tf_api/requirements.txt
7+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
8+
pip3 install -r /src/cortex/tf_api/requirements.txt && \
99
rm -rf /root/.cache/pip*
1010

11-
COPY pkg/workloads/consts.py /src/
12-
COPY pkg/workloads/lib /src/lib
13-
COPY pkg/workloads/tf_api /src/tf_api
11+
COPY pkg/workloads/cortex/consts.py /src/cortex/
12+
COPY pkg/workloads/cortex/lib /src/cortex/lib
13+
COPY pkg/workloads/cortex/tf_api /src/cortex/tf_api
1414

15-
ENTRYPOINT ["/usr/bin/python3", "/src/tf_api/api.py"]
15+
ENTRYPOINT ["/usr/bin/python3", "/src/cortex/tf_api/api.py"]

‎images/tf-train-gpu/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM cortexlabs/tf-base-gpu
22

33
ENV PYTHONPATH="/src:${PYTHONPATH}"
44

5-
COPY pkg/workloads/lib/requirements.txt /src/lib/requirements.txt
6-
RUN pip3 install -r /src/lib/requirements.txt && \
5+
COPY pkg/workloads/cortex/lib/requirements.txt /src/cortex/lib/requirements.txt
6+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
77
rm -rf /root/.cache/pip*
88

9-
COPY pkg/workloads/consts.py /src/
10-
COPY pkg/workloads/lib /src/lib
11-
COPY pkg/workloads/tf_train /src/tf_train
9+
COPY pkg/workloads/cortex/consts.py /src/cortex/
10+
COPY pkg/workloads/cortex/lib /src/cortex/lib
11+
COPY pkg/workloads/cortex/tf_train /src/cortex/tf_train
1212

13-
ENTRYPOINT ["/usr/bin/python3", "/src/tf_train/train.py"]
13+
ENTRYPOINT ["/usr/bin/python3", "/src/cortex/tf_train/train.py"]

‎images/tf-train/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM cortexlabs/tf-base
22

33
ENV PYTHONPATH="/src:${PYTHONPATH}"
44

5-
COPY pkg/workloads/lib/requirements.txt /src/lib/requirements.txt
6-
RUN pip3 install -r /src/lib/requirements.txt && \
5+
COPY pkg/workloads/cortex/lib/requirements.txt /src/cortex/lib/requirements.txt
6+
RUN pip3 install -r /src/cortex/lib/requirements.txt && \
77
rm -rf /root/.cache/pip*
88

9-
COPY pkg/workloads/consts.py /src/
10-
COPY pkg/workloads/lib /src/lib
11-
COPY pkg/workloads/tf_train /src/tf_train
9+
COPY pkg/workloads/cortex/consts.py /src/cortex/
10+
COPY pkg/workloads/cortex/lib /src/cortex/lib
11+
COPY pkg/workloads/cortex/tf_train /src/cortex/tf_train
1212

13-
ENTRYPOINT ["/usr/bin/python3", "/src/tf_train/train.py"]
13+
ENTRYPOINT ["/usr/bin/python3", "/src/cortex/tf_train/train.py"]

‎pkg/operator/workloads/data_job.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func sparkSpec(workloadID string, ctx *context.Context, workloadType string, spa
9595
Mode: sparkop.ClusterMode,
9696
Image: &config.Cortex.SparkImage,
9797
ImagePullPolicy: pointer.String("Always"),
98-
MainApplicationFile: pointer.String("local:///src/spark_job/spark_job.py"),
98+
MainApplicationFile: pointer.String("local:///src/cortex/spark_job/spark_job.py"),
9999
RestartPolicy: sparkop.RestartPolicy{Type: sparkop.Never},
100100
MemoryOverheadFactor: memOverheadFactor,
101101
Arguments: []string{
@@ -106,7 +106,7 @@ func sparkSpec(workloadID string, ctx *context.Context, workloadType string, spa
106106
" " + strings.Join(args, " ")),
107107
},
108108
Deps: sparkop.Dependencies{
109-
PyFiles: []string{"local:///src/spark_job/spark_util.py", "local:///src/lib/*.py"},
109+
PyFiles: []string{"local:///src/cortex/spark_job/spark_util.py", "local:///src/cortex/lib/*.py"},
110110
},
111111
Driver: sparkop.DriverSpec{
112112
SparkPodSpec: sparkop.SparkPodSpec{

0 commit comments

Comments
 (0)