Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with ammonite 1.6.6 #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compatibility with ammonite 1.6.6 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1cf448
Compatibility with ammonite 1.6.6
mandar2812 May 1, 2019
8526f1b
[helios]: Bug Fix
mandar2812 May 1, 2019
0ec3c71
[helios]: Fix to fte data processing
mandar2812 May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions helios/scripts/csss.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import $exec.env
import ammonite.ops.ImplicitWd._

def experiments() =
ls ! env.summary_dir |? (_.isDir) |? (_.segments.last.contains("fte"))
ls ! env.summary_dir |? (_.isDir) |? (_.segments.toSeq.last.contains("fte"))


def scatter_plots_test(summary_dir: Path) =
ls ! summary_dir |? (_.segments.last.contains("scatter_test"))
ls ! summary_dir |? (_.segments.toSeq.last.contains("scatter_test"))

def scatter_plots_train(summary_dir: Path) =
ls ! summary_dir |? (_.segments.last.contains("scatter_train"))
ls ! summary_dir |? (_.segments.toSeq.last.contains("scatter_train"))

val script = pwd / 'helios / 'scripts / "visualise_tl.R"
14 changes: 7 additions & 7 deletions helios/src/main/scala/io/github/mandar2812/PlasmaML/helios/core/timelag/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ package object timelag {
browser_plots = false,
identifier = identifier
)
mkdir ! directory / res.results.summary_dir.segments.last
mkdir ! directory / res.results.summary_dir.segments.toSeq.last
})

//Create a manifest file
Expand All @@ -750,7 +750,7 @@ package object timelag {
s"${r.config.reg_type.getOrElse("NA")}," +
s"${r.config.actual_input_shape.scalar.asInstanceOf[Int]}," +
s"${r.config.input_shape.scalar.asInstanceOf[Int]}," +
s"${r.results.summary_dir.segments.last}"
s"${r.results.summary_dir.segments.toSeq.last}"
)
.mkString("\n")

Expand All @@ -769,14 +769,14 @@ package object timelag {
val files_to_copy =
ls ! res.results.summary_dir |? (
f =>
f.segments.last.contains(".csv") ||
f.segments.last.contains(".png") ||
f.segments.last.contains(".pdf") ||
f.segments.last.contains(".json")
f.segments.toSeq.last.contains(".csv") ||
f.segments.toSeq.last.contains(".png") ||
f.segments.toSeq.last.contains(".pdf") ||
f.segments.toSeq.last.contains(".json")
)

files_to_copy.foreach(
f => cp.into(f, directory / res.results.summary_dir.segments.last)
f => cp.into(f, directory / res.results.summary_dir.segments.toSeq.last)
)

})
Expand Down
8 changes: 5 additions & 3 deletions helios/src/main/scala/io/github/mandar2812/PlasmaML/helios/fte/data/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ package object data {
def write_exp_config(config: FteOmniConfig, dir: Path): Unit = {
if (!(exists ! dir / "config.json")) {
val config_json = write_json(config)
write(dir / "config.json", config_json)
write(dir / "config.json", config_json, createFolders = true)
}
}

Expand Down Expand Up @@ -832,14 +832,16 @@ package object data {
line =>
write.append(
directory / s"training_data_${identifier}.json",
s"${line}\n"
s"${line}\n",
createFolders = true
)

val write_pattern_test: String => Unit =
line =>
write.append(
directory / s"test_data_${identifier}.json",
s"${line}\n"
s"${line}\n",
createFolders = true
)

dataset.training_dataset
Expand Down
20 changes: 10 additions & 10 deletions helios/src/main/scala/io/github/mandar2812/PlasmaML/helios/fte/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,9 @@ package object fte {
}

val use_cached_data = if (use_cached_config) {
val training_data_files = ls ! tf_summary_dir |? (_.segments.last
val training_data_files = ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))
val test_data_files = ls ! tf_summary_dir |? (_.segments.last
val test_data_files = ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))

training_data_files.length > 0 && test_data_files.length > 0
Expand Down Expand Up @@ -596,9 +596,9 @@ package object fte {
val dataset = if (use_cached_config && use_cached_data) {
println("Using previously cached data set")

val training_data_file = (ls ! tf_summary_dir |? (_.segments.last
val training_data_file = (ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))).last
val test_data_file = (ls ! tf_summary_dir |? (_.segments.last
val test_data_file = (ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("test_data_"))).last

read_data_set(
Expand Down Expand Up @@ -709,14 +709,14 @@ package object fte {

val checkpoints =
if (exists ! tf_summary_dir)
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.last
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.toSeq.last
.contains("model.ckpt-"))
else Seq()

val checkpoint_max =
if (checkpoints.isEmpty) 0
else
(checkpoints | (_.segments.last
(checkpoints | (_.segments.toSeq.last
.split("-")
.last
.split('.')
Expand Down Expand Up @@ -1089,9 +1089,9 @@ package object fte {
}

val use_cached_data = if (use_cached_config) {
val training_data_files = ls ! tf_summary_dir |? (_.segments.last
val training_data_files = ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))
val test_data_files = ls ! tf_summary_dir |? (_.segments.last
val test_data_files = ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))

training_data_files.length > 0 && test_data_files.length > 0
Expand Down Expand Up @@ -1138,9 +1138,9 @@ package object fte {
val dataset = if (use_cached_config && use_cached_data) {
println("Using previously cached data set")

val training_data_file = (ls ! tf_summary_dir |? (_.segments.last
val training_data_file = (ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("training_data_"))).last
val test_data_file = (ls ! tf_summary_dir |? (_.segments.last
val test_data_file = (ls ! tf_summary_dir |? (_.segments.toSeq.last
.contains("test_data_"))).last

read_data_set(
Expand Down
8 changes: 4 additions & 4 deletions helios/src/main/scala/io/github/mandar2812/PlasmaML/helios/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,14 @@ package object helios {

val checkpoints =
if (exists(tf_summary_dir))
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.last
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.toSeq.last
.contains("model.ckpt-"))
else Seq()

val checkpoint_max =
if (checkpoints.isEmpty) 0
else
(checkpoints | (_.segments.last
(checkpoints | (_.segments.toSeq.last
.split("-")
.last
.split('.')
Expand Down Expand Up @@ -1339,14 +1339,14 @@ package object helios {

val checkpoints =
if (exists ! tf_summary_dir)
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.last
ls ! tf_summary_dir |? (_.isFile) |? (_.segments.toSeq.last
.contains("model.ckpt-"))
else Seq()

val checkpoint_max =
if (checkpoints.isEmpty) 0
else
(checkpoints | (_.segments.last
(checkpoints | (_.segments.toSeq.last
.split("-")
.last
.split('.')
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Dependencies {

val scala_major = 2.12

val scala_minor = 4
val scala_minor = 8

val scala = s"$scala_major.$scala_minor"

Expand All @@ -28,7 +28,7 @@ object Dependencies {
val dataDirectory = settingKey[File]("The directory holding the data files for running example scripts")

val latest_dynaml_release = "v2.0-beta.1"
val latest_dynaml_dev_release = "v2.0"
val latest_dynaml_dev_release = "v2.0-amm-1.6.6"
val dynaml_branch = ""


Expand Down