Merge branch 'master' of https://github.com/Siddharth-Shrivastava7/ac…

…erta-abide
lsa-pucrs · Apr 18, 2020 · 769cb3f · 769cb3f
2 parents 37d5b95 + 0323a23
commit 769cb3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/download_abide.py b/download_abide.py
@@ -6,6 +6,7 @@
 import urllib.request
 
 
+
 def collect_and_download(derivative, pipeline, strategy, out_dir):
 
     s3_prefix = "https://s3.amazonaws.com/fcp-indi/data/Projects/ABIDE_Initiative"

diff --git a/nn.py b/nn.py
@@ -338,6 +338,7 @@ def run_finetuning(experiment,
     with tf.Session() as sess:
         sess.run(init)
 
+
         # Define model saver
         saver = tf.train.Saver(model["params"], write_version=tf.train.SaverDef.V2)
 

diff --git a/prepare_data.py b/prepare_data.py
@@ -20,6 +20,7 @@
 
 """
 
+
 import os
 import random
 import pandas as pd
@@ -137,7 +138,11 @@ def load_patients_to_file(hdf5, pheno, derivatives):
     pheno_path = "./data/phenotypes/Phenotypic_V1_0b_preprocessed1.csv"
     pheno = load_phenotypes(pheno_path)
 
+<<<<<<< HEAD
     hdf5 = hdf5_handler(bytes("./data/abide.hdf5",encoding="utf8"), 'a')
+=======
+    hdf5 = hdf5_handler(bytes("./data/abide.hdf5",encoding="utf-8"), 'a')
+>>>>>>> 0323a23ab53b9dc7f36b7b9ca066e3bc78a90f36
 
     valid_derivatives = ["cc200", "aal", "ez", "ho", "tt", "dosenbach160"]
     derivatives = [derivative for derivative in arguments["<derivative>"] if derivative in valid_derivatives]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@
		import urllib.request



		def collect_and_download(derivative, pipeline, strategy, out_dir):

		s3_prefix = "https://s3.amazonaws.com/fcp-indi/data/Projects/ABIDE_Initiative"
Expand Down