diff --git a/src/TensorFlowNET.Core/Framework/c_api_util.cs b/src/TensorFlowNET.Core/Framework/c_api_util.cs index efae3e55..300abf6e 100644 --- a/src/TensorFlowNET.Core/Framework/c_api_util.cs +++ b/src/TensorFlowNET.Core/Framework/c_api_util.cs @@ -40,7 +40,8 @@ namespace Tensorflow { case PlatformID.Win32NT: dll = $"{dll}.dll"; - file = Path.Combine(directory, "tensorflow.zip"); + file = Path.Combine(directory, "libtensorflow-cpu-windows-x86_64-1.14.0.zip"); + url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-windows-x86_64-1.14.0.zip"; break; case PlatformID.Unix: dll = $"lib{dll}.so"; @@ -56,7 +57,6 @@ namespace Tensorflow isDllDownloaded = true; return; } - lock (locker) { @@ -81,6 +81,9 @@ namespace Tensorflow { case PlatformID.Win32NT: ZipFile.ExtractToDirectory(file, directory); + Util.CmdHelper.Command($"move lib\\* .\\"); + Util.CmdHelper.Command($"rm -r lib"); + Util.CmdHelper.Command($"rm -r include"); break; case PlatformID.Unix: Util.CmdHelper.Bash($"tar xvzf {file} ./lib/"); diff --git a/src/TensorFlowNET.Core/Util/CmdHelper.cs b/src/TensorFlowNET.Core/Util/CmdHelper.cs index d0178636..d4ed6cb1 100644 --- a/src/TensorFlowNET.Core/Util/CmdHelper.cs +++ b/src/TensorFlowNET.Core/Util/CmdHelper.cs @@ -1,3 +1,19 @@ +/***************************************************************************** + Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +******************************************************************************/ + using System; using System.Collections.Generic; using System.Diagnostics; @@ -9,18 +25,30 @@ namespace Tensorflow.Util { public static class CmdHelper { + public static void Command(string command) + { + Process proc = new System.Diagnostics.Process(); + proc.StartInfo.FileName = @"C:\Windows\System32\cmd.exe"; + proc.StartInfo.Arguments = "/c \" " + command + " \""; + proc.StartInfo.UseShellExecute = false; + proc.StartInfo.RedirectStandardOutput = true; + proc.Start(); + + while (!proc.StandardOutput.EndOfStream) + Console.WriteLine(proc.StandardOutput.ReadLine()); + } + public static void Bash(string command) { - Process proc = new System.Diagnostics.Process (); + Process proc = new System.Diagnostics.Process(); proc.StartInfo.FileName = "/bin/bash"; proc.StartInfo.Arguments = "-c \" " + command + " \""; - proc.StartInfo.UseShellExecute = false; + proc.StartInfo.UseShellExecute = false; proc.StartInfo.RedirectStandardOutput = true; - proc.Start (); + proc.Start(); - while (!proc.StandardOutput.EndOfStream) { - Console.WriteLine (proc.StandardOutput.ReadLine ()); - } + while (!proc.StandardOutput.EndOfStream) + Console.WriteLine(proc.StandardOutput.ReadLine()); } } }