Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ if "%InstallPythonPackages%" == "True" (
call "%PythonExe%" -m pip install --upgrade nose pytest graphviz imageio pytest-cov "jupyter_client>=4.4.0" "nbconvert>=4.2.0"
if %PythonVersion% == 2.7 ( call "%PythonExe%" -m pip install --upgrade pyzmq )
:: Run azureml-dataprep tests only in pyhon 3.7 as its an optional dependency
if %PythonVersion% == 3.7 ( call "%PythonExe%" -m pip install --upgrade azureml-dataprep )
if %PythonVersion% == 3.7 ( call "%PythonExe%" -m pip install --upgrade "azureml-dataprep>=1.1.12" )
call "%PythonExe%" -m pip install --upgrade "%__currentScriptDir%target\%WheelFile%"
call "%PythonExe%" -m pip install "scikit-learn==0.19.2"
)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ then
"${PythonExe}" -m pip install --upgrade pytest-remotedata
elif [ ${PythonVersion} = 3.7 ]
then
"${PythonExe}" -m pip install --upgrade azureml-dataprep
"${PythonExe}" -m pip install --upgrade "azureml-dataprep>=1.1.12"
fi
"${PythonExe}" -m pip install --upgrade "${Wheel}"
"${PythonExe}" -m pip install "scikit-learn==0.19.2"
Expand Down
2 changes: 0 additions & 2 deletions build/libs_linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ libonnxruntime.so
System.Drawing.Common.dll
TensorFlow.NET.dll
NumSharp.Core.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
2 changes: 0 additions & 2 deletions build/libs_mac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ libtensorflow_framework.1.dylib
System.Drawing.Common.dll
TensorFlow.NET.dll
NumSharp.Core.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
2 changes: 0 additions & 2 deletions build/libs_win.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ tensorflow.dll
TensorFlow.NET.dll
NumSharp.Core.dll
System.Drawing.Common.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
11 changes: 7 additions & 4 deletions src/DotNetBridge/RunGraph.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,7 @@ private static void RunGraphCore(EnvironmentBlock* penv, IHostEnvironment env, s
if (extension == ".txt")
dv = TextLoader.LoadFile(host, new TextLoader.Options(), new MultiFileSource(path));
else if (extension == ".dprep")
{
DPrepSettings.Instance.PythonPath = BytesToString(penv->pythonPath);
dv = DataFlow.FromDPrepFile(path).ToDataView();
}
dv = LoadDprepFile(BytesToString(penv->pythonPath), path);
else
dv = new BinaryLoader(host, new BinaryLoader.Arguments(), path);
}
Expand Down Expand Up @@ -286,6 +283,12 @@ private static void RunGraphCore(EnvironmentBlock* penv, IHostEnvironment env, s
}
}

private static IDataView LoadDprepFile(string pythonPath, string path)
{
DPrepSettings.Instance.PythonPath = pythonPath;
return DataFlow.FromDPrepFile(path).ToDataView();
}

private static Dictionary<string, ColumnMetadataInfo> ProcessColumns(ref IDataView view, int maxSlots, IHostEnvironment env)
{
Dictionary<string, ColumnMetadataInfo> result = null;
Expand Down
2 changes: 1 addition & 1 deletion src/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
'nose>=1.3', 'pytest>=4.4.0',
'graphviz', 'imageio',
],
'dprep': ['azureml-dataprep'],
'dprep': ['azureml-dataprep>=1.1.12'],
'utils': ['graphviz', 'imageio'],
},

Expand Down
2 changes: 1 addition & 1 deletion src/python/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ setup(
'nose>=1.3', 'pytest>=4.4.0',
'graphviz', 'imageio',
],
'dprep': ['azureml-dataprep'],
'dprep': ['azureml-dataprep>=1.1.12'],
'utils': ['graphviz', 'imageio'],
},

Expand Down