From 8888f80bda2cdf091c670cb798e2040c1b078a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Fri, 28 Jan 2022 16:33:34 +0100
Subject: [PATCH] python path modifs
---
1_one_instance.py | 4 ++--
default.nix | 4 ++--
scripts/install_nix.sh | 1 +
scripts/start_notebook.sh | 2 +-
scripts/swf_to_batsim_split_by_user.py | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
mode change 100644 => 100755 1_one_instance.py
diff --git a/1_one_instance.py b/1_one_instance.py
old mode 100644
new mode 100755
index c85cb38..dc7a96f
--- 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 ae4359e..1ed03c2 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 4d59227..3199a8b 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 1ef97be..70297d7 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 be78e56..d69ea78 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,
--
GitLab