From 33898dd36918c1be1653f889645804e0d1394b40 Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Fri, 8 Apr 2016 21:10:37 +0900 Subject: [PATCH 1/2] :lipstick: :fire: remove .pyc --- .gitignore | 6 ++++++ neural_art/__init__.pyc | Bin 205 -> 0 bytes neural_art/image_converters/__init__.pyc | Bin 227 -> 0 bytes neural_art/image_converters/image_converter.pyc | Bin 7390 -> 0 bytes .../multi_reference_image_converter.pyc | Bin 7540 -> 0 bytes neural_art/models/__init__.pyc | Bin 157 -> 0 bytes neural_art/models/vgg.pyc | Bin 3610 -> 0 bytes neural_art/utility.pyc | Bin 3239 -> 0 bytes neural_art/utility_old.pyc | Bin 8823 -> 0 bytes 9 files changed, 6 insertions(+) create mode 100644 .gitignore delete mode 100644 neural_art/__init__.pyc delete mode 100644 neural_art/image_converters/__init__.pyc delete mode 100644 neural_art/image_converters/image_converter.pyc delete mode 100644 neural_art/image_converters/multi_reference_image_converter.pyc delete mode 100644 neural_art/models/__init__.pyc delete mode 100644 neural_art/models/vgg.pyc delete mode 100644 neural_art/utility.pyc delete mode 100644 neural_art/utility_old.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..13471e2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.caffemodel +.idea/ +*.png +*.jpg +*.dump +*.pyc \ No newline at end of file diff --git a/neural_art/__init__.pyc b/neural_art/__init__.pyc deleted file mode 100644 index a72403622762403ea3551a13847bf20becf70bf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmZSn%*%E1-LbG_1}I8bI_`FUljMJ1_4V0#!qmO+SO zSs*JZGf!VnPd_iUv?wtrKC!4oKR!M)FS8^*Uaz3CgafF;254ewPO2RvkX_6IBzPEk F7y%IpEdBrh diff --git a/neural_art/image_converters/__init__.pyc b/neural_art/image_converters/__init__.pyc deleted file mode 100644 index 3d6634a44e2a2a1e3c864b191dd218671c52fdea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmZSn%*(Y#=1f>J0~9a;X$K%KmH-kdK*Y$9!@v*%WibL-Obo#q%s|P^|3IL@2xOIj z2rWMiklqr0kW_ABdTM-feqLE>Q3(*q1I2Pnb4oJfi&E24i&FEFQ{&OpXaJQkAc$f; zAU7#9PhU?@KQFbkC^08Kv8Y5JO;fRce0*kJW=VX!UO{CE2T+SmZhlH>PO2TqMa3ZZ Ha4`Y^?iA`YgU$!Mpwn$_;i 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 BakLfl=@_Qirj3~#=u$pFZ^wqE2w_A-!icm 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 U96*IOK=IO?R6CHl#X!se06!!kyZ`_I diff --git a/neural_art/models/vgg.pyc b/neural_art/models/vgg.pyc deleted file mode 100644 index 2d0c091b9b87cbe4129d8c683f23882e210c3b2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3610 zcmb_e-E!Mh5MIeYiPN-%0;Sx*1uZohn#6YChEC|TOba)@P-fbpGmJ)&WJku4UFkR^ zGwxOTEIbb{z&kL*1Hkv~k!{sxApNnWqdj}h+1<0d=i5{H>*~fQzy0wfl;T&x_r5ri z2OuImjtoUk9C_x5!@es+SDv{#2D(zBt4dcSu1U|4s46c-E<}EMR+p$I(V9f{ISU?0r`dTQlO%gM#z>K}hv=yfo_}&6t2N zA_GSTt_&(Nb>za4sfb^dsjEayrr?89muXe9=W=$y?w~4zHG1g#pSR@&Ce>uHE`tW0 z4iVVKFRtYGxfu-k8}j@&50OsE4E;74FutlTj28l?sOA<3KeW#U?O}R(PBYqbyF9n+7Mb61^miG*aUr zYSKN*&EsKDW2)Lz>^LyT9_4tn$!wrWM?O|XN!nMP!{9v5n&68z`DdVxl5}@xXE%)} zSupg2%;Y;?jYs}Pbl9Zxx*-n< zUnbBYbN@DodF~g4W;%?5Q+W_!sp}L15|{HeKqgC~SToq8Y>!!NuA>P~<1FaM{&+MR zA|?EGq^Xp}!->TR8gTXo`EhR;oE$~L!TVUBb&a-K2Dn$J?H9oc)&HUbs3`z^&APp#tK%zJ2-!l>elkm6*BoVWCIW5jqWQk!lJ5g#CPQ{P;ZZQmV~;87eT8OW zlv0<0DQ|Xma%Owo*={Igc7N=K=BECd%V`bBN9HZjBU1g(Dd>I}E$Q=;# z)BV4dEdnNJf_IzD%~C#cQyx#fChY?K?WxhcVT4Kp=)K12U`)30=G0+Pe--UVaQ=Uw z{d}K<;tEUi9OQ}cmRVc4qu^*k2iVyMHGEkPu)R`ZmP!DYunJhoKzKH;xN;#=rKeqFKGb{R$`j!f^@< z|D|d$@NZT%s2^2>>DW!QKoI`4ek@_F_aO$}9$j0IqUaj(kj@V3WsBTvn0xb`nA@3| zoAU<6>)-y})?RyGk;-Ja^)LOHKv=V7#< z!24#t_G<Pc^6CK>99 z2bPVE;ccY2rSB|m=&biE+#P#oC&-PC261S#o_JKdaF0@#@sZZMd$z(IFyA$kwwz7< H-?;S;YHe+f diff --git a/neural_art/utility.pyc b/neural_art/utility.pyc deleted file mode 100644 index 96dfec5a6dcfacebf83a99a81f9696549a27c8e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3239 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 HOr`uk9`*v; From 7c916832956338b0d5ff6072ab602e59a0e5d7bf Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Mon, 11 Apr 2016 12:17:15 +0900 Subject: [PATCH 2/2] :lipstick: add args.modelpath --- README.md | 9 +++++++++ bin/convert_image_multi.py | 3 ++- .../multi_reference_image_converter.py | 1 - neural_art/utility.py | 11 +++++++---- requirements.txt | 3 +++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 73bd9a2..50a9fc0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,13 @@ neural_style_synthesizer INSTALL --------------- +The model files of neural networks are not contained in this repository. +You can get them from [nin_imagenet.caffemodel](https://gist.github.com/mavenlin/d802a5849de39225bcc6) and [VGG_ILSVRC_16_layers.caffemodel](https://gist.github.com/ksimonyan/211839e770f7b538e2d8#file-readme-md). + +Dependent libraries are installed with the following script. + ``` +pip install numpy pip install -r requirements.txt ``` @@ -19,6 +25,7 @@ with CPU ``` python bin/convert_image_multi.py \ + --modelpath=./VGG_ILSVRC_16_layers.caffemodel \ --iteration=100 \ --gpu=-1 \ --xsplit=1 --ysplit=1 --resize=300 \ @@ -31,6 +38,7 @@ with GPU ``` python bin/convert_image_multi.py \ + --modelpath=./VGG_ILSVRC_16_layers.caffemodel \ --iteration=100 \ --gpu=0 \ --xsplit=1 --ysplit=1 --resize=300 \ @@ -46,6 +54,7 @@ Split style image to 2x2 ``` python bin/convert_image_multi.py \ + --modelpath=./VGG_ILSVRC_16_layers.caffemodel \ --iteration=100 \ --gpu=0 \ --xsplit=2 --ysplit=2 --resize=300 \ diff --git a/bin/convert_image_multi.py b/bin/convert_image_multi.py index 7dd2864..d35df35 100644 --- a/bin/convert_image_multi.py +++ b/bin/convert_image_multi.py @@ -22,6 +22,7 @@ parser.add_argument("--debug_span", type=int, default=100) parser.add_argument("--average_pooling", action="store_true") parser.add_argument("--model", default="vgg") +parser.add_argument("--modelpath") parser.add_argument("--random_init", action="store_true") parser.add_argument("--init_image", default=None) args = parser.parse_args() @@ -44,7 +45,7 @@ init_img = neural_art.utility.load_image(args.init_image) init_img = neural_art.utility.resize_img(init_img, args.resize) -model = neural_art.utility.load_nn(args.model) +model = neural_art.utility.load_nn(args.model, modelpath=args.modelpath) converter = neural_art.image_converters.MultiReferenceImageConverter(texture_imgs, gpu=args.gpu, content_weight=args.content_weight, texture_weight=1, model=model, average_pooling=args.average_pooling) if args.debug: diff --git a/neural_art/image_converters/multi_reference_image_converter.py b/neural_art/image_converters/multi_reference_image_converter.py index 809bdad..81a5c18 100644 --- a/neural_art/image_converters/multi_reference_image_converter.py +++ b/neural_art/image_converters/multi_reference_image_converter.py @@ -5,7 +5,6 @@ import chainer.functions import neural_art import numpy -import scipy.optimize import image_converter import openopt diff --git a/neural_art/utility.py b/neural_art/utility.py index b562a64..6a14cc7 100644 --- a/neural_art/utility.py +++ b/neural_art/utility.py @@ -29,17 +29,20 @@ def resize_img(img, max_length): new_h = max_length*orig_h/orig_w return img.resize((new_w,new_h)) -def load_nn(modelname): +def load_nn(modelname, modelpath = None): cachepath = "{}.dump".format(modelname) if os.path.exists(cachepath): nn = pickle.load(open(cachepath)) else: if modelname == 'vgg': - nn = neural_art.models.VGG("VGG_ILSVRC_16_layers.caffemodel", no_padding=False) + if modelpath is None: modelpath = "VGG_ILSVRC_16_layers.caffemodel" + nn = neural_art.models.VGG(modelpath, no_padding=False) elif modelname == 'vgg_nopad': - nn = neural_art.models.VGG("VGG_ILSVRC_16_layers.caffemodel", no_padding=True) + if modelpath is None: modelpath = "VGG_ILSVRC_16_layers.caffemodel" + nn = neural_art.models.VGG(modelpath, no_padding=True) elif modelname == 'nin': - nn = neural_art.models.NIN("nin_imagenet.caffemodel") + if modelpath is None: modelpath = "nin_imagenet.caffemodel" + nn = neural_art.models.NIN(modelpath) else: print 'invalid model name.' exit(1) diff --git a/requirements.txt b/requirements.txt index 2af8018..ed4310d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ +numpy openopt cvxopt +chainer +pillow