diff --git a/Dockerfile b/Docker/Dockerfile similarity index 100% rename from Dockerfile rename to Docker/Dockerfile diff --git a/Jenkinsfile.create_dataset b/Jenkins/Jenkinsfile.create_dataset similarity index 85% rename from Jenkinsfile.create_dataset rename to Jenkins/Jenkinsfile.create_dataset index ddc7289..c5f54dc 100644 --- a/Jenkinsfile.create_dataset +++ b/Jenkins/Jenkinsfile.create_dataset @@ -1,5 +1,6 @@ node { - docker.image('s444452/ium:1.3').inside { + def dockerImageIUM = docker.build("s444452/ium:1.3","Docker/Dockerfile") + dockerImageIUM.inside { stage('Preparation') { properties([ parameters([ @@ -28,8 +29,8 @@ node { stage('Run script') { withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}", "KAGGLE_KEY=${params.KAGGLE_KEY}","CUTOFF=${params.CUTOFF}"]) { - sh "python3 download_dataset.py '.' 'dataset.csv'" - sh "python3 train_neural_network.py '.'" + sh "python3 Scripts/download_dataset.py '.' 'dataset.csv'" + sh "python3 Scripts/train_neural_network.py '.'" } } stage('Archive artifacts') { diff --git a/Jenkinsfile.stats b/Jenkins/Jenkinsfile.stats similarity index 95% rename from Jenkinsfile.stats rename to Jenkins/Jenkinsfile.stats index d23f78e..862099f 100644 --- a/Jenkinsfile.stats +++ b/Jenkins/Jenkinsfile.stats @@ -20,7 +20,7 @@ node { stage('Run script') { withEnv(["KAGGLE_USERNAME=${params.KAGGLE_USERNAME}", "KAGGLE_KEY=${params.KAGGLE_KEY}"]) { - sh "python3 generate_dataset_stats.py '.'" + sh "python3 Scripts/generate_dataset_stats.py '.'" } } stage('Archive artifacts') { diff --git a/dataset_stats.sh b/Scripts/dataset_stats.sh similarity index 100% rename from dataset_stats.sh rename to Scripts/dataset_stats.sh diff --git a/download_dataset.py b/Scripts/download_dataset.py similarity index 100% rename from download_dataset.py rename to Scripts/download_dataset.py diff --git a/download_dataset.sh b/Scripts/download_dataset.sh similarity index 100% rename from download_dataset.sh rename to Scripts/download_dataset.sh diff --git a/figlet-loop.sh b/Scripts/figlet-loop.sh similarity index 100% rename from figlet-loop.sh rename to Scripts/figlet-loop.sh diff --git a/generate_dataset_stats.py b/Scripts/generate_dataset_stats.py similarity index 100% rename from generate_dataset_stats.py rename to Scripts/generate_dataset_stats.py diff --git a/train_neural_network.py b/Scripts/train_neural_network.py similarity index 100% rename from train_neural_network.py rename to Scripts/train_neural_network.py diff --git a/requirements.txt b/requirements.txt index 5583e55..e74fa5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,12 @@ cachetools==5.0.0 certifi==2021.10.8 charset-normalizer==2.0.12 click==8.1.2 +colorama==0.4.4 +docopt==0.6.2 flatbuffers==2.0 gast==0.5.3 +gitdb==4.0.9 +GitPython==3.1.27 google-auth==2.6.6 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 @@ -14,19 +18,24 @@ h5py==3.6.0 idna==3.3 importlib-metadata==4.11.3 joblib==1.1.0 +jsonpickle==1.5.2 kaggle==1.5.12 keras==2.8.0 Keras-Preprocessing==1.1.2 libclang==14.0.1 Markdown==3.3.6 +munch==2.5.0 nltk==3.7 numpy==1.22.3 oauthlib==3.2.0 opt-einsum==3.3.0 +packaging==21.3 pandas==1.4.2 protobuf==3.20.1 +py-cpuinfo==8.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 +pyparsing==3.0.8 python-dateutil==2.8.2 python-slugify==6.1.1 pytz==2022.1 @@ -34,10 +43,12 @@ regex==2022.3.15 requests==2.27.1 requests-oauthlib==1.3.1 rsa==4.8 +sacred==0.8.2 scikit-learn==1.0.2 scipy==1.8.0 six==1.16.0 sklearn==0.0 +smmap==5.0.0 tensorboard==2.8.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1