refactoring

gomax22 · Jun 10, 2024 · fcdb830 · fcdb830
1 parent 7d89f83
commit fcdb830
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -170,4 +170,3 @@ cython_debug/
 #.idea/
 
 data/
-eval/
diff --git a/Dockerfile.client → docker/client/Dockerfile.client b/Dockerfile.client → docker/client/Dockerfile.client
@@ -15,14 +15,14 @@ WORKDIR /app
 COPY . .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
-RUN unzip WIDER_train.zip -d data/ && mv data/WIDER_train/images data/WIDER_FACE  && rm -rf data/WIDER_train && rm WIDER_train.zip
-RUN tar xvf annotations.tar.gz -C data/WIDER_FACE/  && rm annotations.tar.gz
-RUN unzip afw_images.zip -d data/ && mv data/afw_images data/AFW && rm -rf data/afw_images && rm afw_images.zip
-RUN unzip pascal_images.zip -d data/ && mv data/pascal_images data/PASCAL && rm -rf data/pascal_images && rm pascal_images.zip
-RUN unzip fddb_images.zip -d data/ && mv data/fddb_images data/FDDB && rm -rf data/fddb_images && rm fddb_images.zip
+RUN unzip data/WIDER_FACE/WIDER_train.zip -d data/ && mv data/WIDER_train/images data/WIDER_FACE  && rm -rf data/WIDER_train && rm data/WIDER_FACE/WIDER_train.zip
+RUN tar xvf data/WIDER_FACE/annotations.tar.gz -C data/WIDER_FACE/  && rm data/WIDER_FACE/annotations.tar.gz
+RUN unzip data/AFW/afw_images.zip -d data/ && mv data/afw_images data/AFW && rm -rf data/afw_images && rm data/AFW/afw_images.zip
+RUN unzip data/PASCAL/pascal_images.zip -d data/ && mv data/pascal_images data/PASCAL && rm -rf data/pascal_images && rm data/PASCAL/pascal_images.zip
+RUN unzip data/FDDB/fddb_images.zip -d data/ && mv data/fddb_images data/FDDB && rm -rf data/fddb_images && rm data/FDDB/fddb_images.zip
 
 
-COPY start_flower_client.sh /usr/local/bin/start_flower_client.sh
+COPY docker/client/start_flower_client.sh /usr/local/bin/start_flower_client.sh
 RUN chmod +x /usr/local/bin/start_flower_client.sh
 
 ENV PARTITION_ID=0

diff --git a/Dockerfile.client.dockerignore → docker/client/Dockerfile.client.dockerignore b/Dockerfile.client.dockerignore → docker/client/Dockerfile.client.dockerignore
@@ -92,9 +92,3 @@ venv/
 */*.swp
 */*/*.swp
 */*/*/*.swp
-
-eval/
-weights
-data/*/images
-data/*/annotations
-start_flower_server.sh
diff --git a/start_flower_client.sh → docker/client/start_flower_client.sh b/start_flower_client.sh → docker/client/start_flower_client.sh
diff --git a/Dockerfile.server → docker/server/Dockerfile.server b/Dockerfile.server → docker/server/Dockerfile.server
@@ -13,7 +13,7 @@ WORKDIR /app
 COPY . .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
-COPY start_flower_server.sh /usr/local/bin/start_flower_server.sh
+COPY docker/server/start_flower_server.sh /usr/local/bin/start_flower_server.sh
 RUN chmod +x /usr/local/bin/start_flower_server.sh
 
 ENV NUM_ROUNDS=2

diff --git a/Dockerfile.server.dockerignore → docker/server/Dockerfile.server.dockerignore b/Dockerfile.server.dockerignore → docker/server/Dockerfile.server.dockerignore
@@ -93,11 +93,3 @@ venv/
 */*/*.swp
 */*/*/*.swp
 
-eval/
-weights
-data/*/images
-data/*/annotations
-
-*.zip
-*.tar.gz
-start_flower_client.sh
diff --git a/start_flower_server.sh → docker/server/start_flower_server.sh b/start_flower_server.sh → docker/server/start_flower_server.sh