diff --git a/1_one_instance.py b/1_one_instance.py old mode 100644 new mode 100755 index c85cb384aa00b1f0177dc9bc8de9dcae952d22b4..dc7a96f83713d6c7a1831261f73b73afd08312e2 --- a/1_one_instance.py +++ b/1_one_instance.py @@ -7,8 +7,8 @@ import subprocess import argparse sys.path.insert(0, '/scripts') -import swf_to_batsim_split_by_user as split_user -from run_batsim_exp import * +import scripts.swf_to_batsim_split_by_user as split_user +from scripts.run_batsim_exp import * #import swf_moulinette diff --git a/default.nix b/default.nix index ae4359e23ab55fdbe77bab912550c558971dfc9c..1ed03c2e4925179cd7882554ba068b9da188fc1d 100644 --- a/default.nix +++ b/default.nix @@ -40,8 +40,8 @@ let self = rec { }; }); - experiment_env = mkShell rec { - name = "experiment_env"; + exp_env = mkShell rec { + name = "exp_env"; buildInputs = [ # simulator my-batsim diff --git a/scripts/install_nix.sh b/scripts/install_nix.sh index 4d592277e1591df0cf65fe6a2bb7caaefa377148..3199a8b893aeda82274c0a94c64fbad8b9d482e4 100644 --- a/scripts/install_nix.sh +++ b/scripts/install_nix.sh @@ -3,4 +3,5 @@ cd ~/demand-response-user sudo-g5k sudo su root --command "echo 1 > /proc/sys/kernel/unprivileged_userns_clone" curl https://nixos.org/releases/nix/nix-2.6.0/install | sh +source ${HOME}/.nix-profile/etc/profile.d/nix.sh nix-store --import < cache_nix diff --git a/scripts/start_notebook.sh b/scripts/start_notebook.sh index 1ef97be560bc26213b5d5fc733ad1c84e5ddbaf9..70297d78a63eb8bbf587c90047cb9cc21d91c452 100755 --- a/scripts/start_notebook.sh +++ b/scripts/start_notebook.sh @@ -1,3 +1,3 @@ #/bin/bash cd ~/demand-response-user -nix-shell --pure -A experiment_env --run "jupyter notebook --ip $(hostname -f) --no-browser" +nix-shell --pure -A exp_env --run "jupyter notebook --ip $(hostname -f) --no-browser" diff --git a/scripts/swf_to_batsim_split_by_user.py b/scripts/swf_to_batsim_split_by_user.py index be78e56e5862ec6ba5c7293ef2cb729644a438f5..d69ea789ac2bc10097f9ce213d23c5361d0339b2 100755 --- a/scripts/swf_to_batsim_split_by_user.py +++ b/scripts/swf_to_batsim_split_by_user.py @@ -13,7 +13,7 @@ import sys import datetime import os -from swf import SwfField +from scripts.swf import SwfField def generate_workload(input_swf, output_folder,