From 42bb9e69280acbafadf8030bdeef0e7cb170623c Mon Sep 17 00:00:00 2001
From: GreenGarnets <kmu9842@sogang.ac.kr>
Date: Thu, 30 Jan 2020 05:18:31 +0900
Subject: [PATCH] loss function change

---
 __pycache__/dataset.cpython-36.pyc   | Bin 5015 -> 5015 bytes
 dataset.py                           |  10 +++++-----
 infer.py                             |   4 ++--
 net/__pycache__/model.cpython-36.pyc | Bin 1687 -> 1682 bytes
 net/model.py                         |   2 +-
 train.py                             |   4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/__pycache__/dataset.cpython-36.pyc b/__pycache__/dataset.cpython-36.pyc
index 1711f64ba43c40ef6ee0b70dd71b47cb99ace11a..7bb551f64817ff5ad486801d743bd8230780967e 100644
GIT binary patch
delta 237
zcmbQPK3!een3tDp(sRSOd_@L^#|%h-8OU}3;^Jcym3IgqN)^wNOyNo4ZDwL*NMQ_S
z(B#|r&6Sh!-ew!FEM`lm622Oq8op*G7lv4q7^YgGT8SE=6rOCR3CzWPH4+e3(X1Nr
zERGbOW=2MaJT5SsZSrGYWyUR=+4*)d3-B-rFtadnG4U~TF><j~iA>(eCo=hoV6%aS
zo_<PVNuqvneqMU9eo=mYNpV3&YEf!@PGWIMUVcfceriRAUUqRtrUx$rgQnEvQlVXw
URfHrb#|ZN?s!h%j)?j1?0PGn(;{X5v

delta 199
zcmbQPK3!een3tF9$0Pl?LPZ9K#|%h-8OU}3;^K1?m3K&=O6AIuOyOx}jFL(f&yr4+
zYG!0)NMQ_S(B$3t&Xtq#(Pk5_EM{J}622Oq8op*G7lv4i$*XxK#pl$BXK|$Pq%(pv
z<ne%cZ0U@Xuk$K1?%4dBcPBG5ACu7J?Sf1Axb^f)Qj1IC^V8GyHDxAu3+)oS#h#N{
kT#}Mmbc-`BGbc4KF*mii$aAv0uo|Pr<UC;wW=1YX0DJv58vp<R

diff --git a/dataset.py b/dataset.py
index 5366bd4..956d78f 100644
--- a/dataset.py
+++ b/dataset.py
@@ -236,9 +236,9 @@ def timeStamp(filename, term) :
         return_timestamp = []
         for (note, fx) in zip(note_time_Stamp, fx_time_Stamp) :
             if note == 1 or fx == 1 :
-                return_timestamp.append([1])
+                return_timestamp.append(1)
             else :
-                return_timestamp.append([0])
+                return_timestamp.append(0)
         
         # test log
         index = 0
@@ -255,9 +255,9 @@ def timeStamp(filename, term) :
         return return_timestamp
 
 if __name__ == "__main__":
-    filenames = os.listdir("./test_ogg/")
-    KshDataset.music_cache_make(filenames)
-    #KshDataset.timeStamp("./data/songs/rootsphere_lastnote/exh.ksh", 3400)
+    #filenames = os.listdir("./test_ogg/")
+    #$KshDataset.music_cache_make(filenames)
+    KshDataset.timeStamp("./data/songs/rootsphere_lastnote/exh.ksh", 3400)
     #y, sr = librosa.load("./data/songs/rootsphere_lastnote/nofx.ogg", sr=44100)
     #KshDataset.timeStamp("./data/songs/rootsphere_lastnote/exh.ksh", y.shape[0])
     #print(y.shape[0]//441)
\ No newline at end of file
diff --git a/infer.py b/infer.py
index d273fea..84be894 100644
--- a/infer.py
+++ b/infer.py
@@ -71,7 +71,7 @@ def infer(model, device, batch, filename, savename) :
     #print(fx_time_Stamp_output)
     #print(fx_time_Stamp_output)
 
-    song = mp.Audio(filename = ("./test_ogg/bgm.ogg"),  note_timestamp = note_time_Stamp_output, fx_timestamp = fx_time_Stamp_output)
+    song = mp.Audio(filename = ("./data_test/songs/badapple_nomico_alreco/nofx.ogg"),  note_timestamp = note_time_Stamp_output, fx_timestamp = fx_time_Stamp_output)
     song.synthesize(diff='ka')
     song.save(filename = savename)
 
@@ -98,7 +98,7 @@ def main():
     #infer(model, device, batch, "./cache/albida.npy","./test_Output/infer.wav")
     #infer(model, device, batch, "./test_ogg/nofx.npy","./test_Output/infer2.wav")
     #infer(model, device, batch, "./Asset/KANA-BOON - Silhouette.ogg","./test_Output/infer3.wav")
-    infer(model, device, batch, "./test_ogg/bgm.npy","./test_Output/infer4.wav")
+    infer(model, device, batch, "./cache/badapple_nomico_alreco.npy","./test_Output/infer3.wav")
     
 
 
diff --git a/net/__pycache__/model.cpython-36.pyc b/net/__pycache__/model.cpython-36.pyc
index 81d487edab906f3ea6838b7a734ca6842fff5e63..27f4879769c265f22c1a4544ad38dfd7991c368c 100644
GIT binary patch
delta 233
zcmbQvJBgRwn3tE!=eglVc0VRw=4PfEhIqjghF}IwuE|ME-jg>mU1Q|k+{w(ySpSlV
zfq_Aj_ZE9`VQFe=Rcet4kY6MUBE&$1IEat{61UikQj0SZ3sP^f6lVg}Nr5D!K@zMb
z`9;YYKoc_4bMrG(ie!L-n#@JAAUVd0Tg>^TB}MWe)nGyaB+Q<cUsRr0lwvrUlQoQy
ncX9%&gb-YbCS#EtNV&q~F4jawzR7P`iv{44P(vo?vuOYTOR_fP

delta 256
zcmbQlJDr!^n3tF9>OH-U?0!tVT+K{14Do^~48aVV+>?`-yqRAzF-%^~bc2y^a|<&g
zV|@`10|SF5?=AM?!qU{#s?;J;AiqcqM2Le32@oL(ByO=6r50x-7Np){Db56{lLkr1
zfFxK;@{5u)fF@+7=jLao6v+YwHJOX#Kyr)~x0v%wONtbL90;KZ5@t`!FDg$gN-><w
z!WyQ{2a?nTiSx$CC+8#<7bmCY<iy7#bZIgc$%7OrPHtsQWaOXxoV8d$0VIGR6enk~
GX#fB#)jkmb

diff --git a/net/model.py b/net/model.py
index 29942de..031a758 100644
--- a/net/model.py
+++ b/net/model.py
@@ -37,7 +37,7 @@ def __init__(self):
 
         self.fc1 = nn.Linear(1024, 512)
         self.fc2 = nn.Linear(512, 256)
-        self.fc3 = nn.Linear(256, 2)
+        self.fc3 = nn.Linear(256, 1)
 
         #self.lstm = nn.LSTM()
         
diff --git a/train.py b/train.py
index 06ee2a4..6fcf162 100644
--- a/train.py
+++ b/train.py
@@ -80,7 +80,7 @@ def main():
     model.to(device)
     #input = torch.rand(128,3,80,15)
 
-    criterion = nn.CrossEntropyLoss()
+    criterion = nn.MSELoss()
     optimizer = optim.SGD(model.parameters(), lr=0.01, momentum=0.9)
     scheduler = lr_scheduler.StepLR(optimizer, step_size=200, gamma=0.1)
 
@@ -125,7 +125,7 @@ def main():
                 __ = 1
 
             input = input.to(device, dtype=torch.float)
-            target = target.to(device, dtype=torch.int64)
+            target = target.to(device, dtype=torch.float)
             
             #print(input.shape)    
             #print(target.shape)