From 73fc7ef83a6bdcc36f44d3784f20f4ce120e7659 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Sun, 10 Mar 2019 21:33:35 +0800 Subject: [PATCH 01/87] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9cfd9148..f2d43cdc 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](./LICENCE) [![Project Status](https://img.shields.io/badge/version-0.4.1-green.svg)]() +[![Build Status](https://travis-ci.org/etveritas/xlearn.svg?branch=etveritas-xlearn)](https://travis-ci.org/etveritas/xlearn) +[![Build status](https://ci.appveyor.com/api/projects/status/kydqbf8l270tns0t/branch/etveritas-xlearn?svg=true)](https://ci.appveyor.com/project/etveritas/xlearn/branch/etveritas-xlearn) ## What is xLearn? From 8612f1f8104267ac6ce769a9c2a498d2b8945625 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 12 Mar 2019 20:46:28 +0800 Subject: [PATCH 02/87] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2d43cdc..9abc5f7d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](./LICENCE) -[![Project Status](https://img.shields.io/badge/version-0.4.1-green.svg)]() +[![Project Status](https://img.shields.io/badge/version-0.4.2-green.svg)]() [![Build Status](https://travis-ci.org/etveritas/xlearn.svg?branch=etveritas-xlearn)](https://travis-ci.org/etveritas/xlearn) [![Build status](https://ci.appveyor.com/api/projects/status/kydqbf8l270tns0t/branch/etveritas-xlearn?svg=true)](https://ci.appveyor.com/project/etveritas/xlearn/branch/etveritas-xlearn) From aaaa3c6b935b36ef5d16bd6931ede1b27b19deeb Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 12 Mar 2019 20:48:23 +0800 Subject: [PATCH 03/87] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 9abc5f7d..327ba8be 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](./LICENCE) [![Project Status](https://img.shields.io/badge/version-0.4.2-green.svg)]() -[![Build Status](https://travis-ci.org/etveritas/xlearn.svg?branch=etveritas-xlearn)](https://travis-ci.org/etveritas/xlearn) -[![Build status](https://ci.appveyor.com/api/projects/status/kydqbf8l270tns0t/branch/etveritas-xlearn?svg=true)](https://ci.appveyor.com/project/etveritas/xlearn/branch/etveritas-xlearn) ## What is xLearn? From 7ae9367c675bc1c2a5b53c5a5bfb8587bac79976 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Sun, 14 Apr 2019 22:58:39 +0800 Subject: [PATCH 04/87] remove python test --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2351e186..77e839cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,3 @@ script: - ./build-travis.sh - cd build/test/ - ./run_all_test.sh - - cd ../python-package/test/ - - python test_python.py test_data_conversion.py From 95aac7964d958ed17d731182e5509585d8bc53e7 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Mon, 15 Apr 2019 10:19:13 +0800 Subject: [PATCH 05/87] remove python test --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2351e186..77e839cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,3 @@ script: - ./build-travis.sh - cd build/test/ - ./run_all_test.sh - - cd ../python-package/test/ - - python test_python.py test_data_conversion.py From ee2b176790b03f3de0f9446960c7032e10c0b7e6 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 17:39:20 +0800 Subject: [PATCH 06/87] add VS solution for Windows;add python-package install requires;supplement CI script; --- .travis.yml | 4 + appveyor.yml | 11 +- python-package/setup.py | 4 + python-package/setup_pip.py | 4 + python-package/xlearn/base.py | 14 ++ python-package/xlearn/data.py | 2 +- src/base/mman.h | 2 + src/base/unistd.h | 3 + src/base/utsname.h | 2 + windows/xLearn.sln | 51 ++++ windows/xlearn_api/xlearn_api.vcxproj | 206 ++++++++++++++++ windows/xlearn_api/xlearn_api.vcxproj.filters | 225 +++++++++++++++++ windows/xlearn_predict/xlearn_predict.vcxproj | 207 ++++++++++++++++ .../xlearn_predict.vcxproj.filters | 228 ++++++++++++++++++ windows/xlearn_train/xlearn_train.vcxproj | 207 ++++++++++++++++ .../xlearn_train/xlearn_train.vcxproj.filters | 228 ++++++++++++++++++ 16 files changed, 1395 insertions(+), 3 deletions(-) create mode 100644 windows/xLearn.sln create mode 100644 windows/xlearn_api/xlearn_api.vcxproj create mode 100644 windows/xlearn_api/xlearn_api.vcxproj.filters create mode 100644 windows/xlearn_predict/xlearn_predict.vcxproj create mode 100644 windows/xlearn_predict/xlearn_predict.vcxproj.filters create mode 100644 windows/xlearn_train/xlearn_train.vcxproj create mode 100644 windows/xlearn_train/xlearn_train.vcxproj.filters diff --git a/.travis.yml b/.travis.yml index 77e839cf..93ea6751 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,7 @@ script: - ./build-travis.sh - cd build/test/ - ./run_all_test.sh + - cd ../python-package/test/ + - pip3 install scikit-learn cython pandas + - python3 test_python.py + - python3 test_data_conversion.py diff --git a/appveyor.yml b/appveyor.yml index 47e8a113..55c02b75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,11 +5,18 @@ build_script: cmake -G "Visual Studio 15 Win64" ../ && MSBuild xLearn.sln /p:Configuration=Release && cd python-package && - C:\\Python36-x64\\Scripts\\pip install wheel numpy scipy scikit-learn cython && + C:\\Python36-x64\\Scripts\\pip install wheel numpy scipy scikit-learn cython pandas && C:\\Python36-x64\\python.exe setup.py bdist_wheel --python-tag py3 test_script: cd ..\test && - .\run_all_test.bat + .\run_all_test.bat && + cd ..\python-package\test && + C:\\Python36-x64\\python.exe test_data_conversion.py && + C:\\Python36-x64\\python.exe test_python.py && + C:\\Python35-x64\\python.exe test_data_conversion.py && + C:\\Python35-x64\\python.exe test_python.py && + C:\\Python34-x64\\python.exe test_data_conversion.py && + C:\\Python34-x64\\python.exe test_python.py artifacts: - path: build_win\Release\*.exe name: Bits diff --git a/python-package/setup.py b/python-package/setup.py index 60ad26d8..790bb845 100644 --- a/python-package/setup.py +++ b/python-package/setup.py @@ -39,6 +39,10 @@ # this will use MANIFEST.in during install where we specify additional files, # this is the golden line include_package_data=True, + install_requires=[ + "numpy", + "scipy" + ], data_files=[('xlearn', LIB_PATH)], license='Apache-2.0', classifiers=['License :: OSI Approved :: Apache Software License'], diff --git a/python-package/setup_pip.py b/python-package/setup_pip.py index 567774ce..564cba67 100644 --- a/python-package/setup_pip.py +++ b/python-package/setup_pip.py @@ -120,6 +120,10 @@ def run(self): # this will use MANIFEST.in during install where we specify additional files, # this is the golden line include_package_data=True, + install_requires=[ + "numpy", + "scipy" + ], # move data to MANIFEST.in license='Apache-2.0', classifiers=['License :: OSI Approved :: Apache Software License'], diff --git a/python-package/xlearn/base.py b/python-package/xlearn/base.py index 914cfd22..0d70de63 100644 --- a/python-package/xlearn/base.py +++ b/python-package/xlearn/base.py @@ -100,3 +100,17 @@ def c_str(string): Hello, world! """ return ctypes.c_char_p(string.encode('utf-8')) + +"""pandas""" +try: + from pandas import Series, DataFrame +except ImportError: + class Series(object): + """Dummy class for pandas.Series.""" + + pass + + class DataFrame(object): + """Dummy class for pandas.DataFrame.""" + + pass diff --git a/python-package/xlearn/data.py b/python-package/xlearn/data.py index eef587cd..37aba623 100644 --- a/python-package/xlearn/data.py +++ b/python-package/xlearn/data.py @@ -16,7 +16,7 @@ import os, ctypes from numpy import ndarray -from pandas import DataFrame, Series +from .base import DataFrame, Series import numpy as np from .base import _LIB, XLearnHandle from .base import _check_call, c_str diff --git a/src/base/mman.h b/src/base/mman.h index b3e74880..2ca21af5 100644 --- a/src/base/mman.h +++ b/src/base/mman.h @@ -22,6 +22,8 @@ #ifndef _SYS_MMAN_H_ #define _SYS_MMAN_H_ +#pragma warning(disable : 4996) + // All the headers include this file. #define NOMINMAX #define WIN32_LEAN_AND_MEAN diff --git a/src/base/unistd.h b/src/base/unistd.h index 5ca097c2..e64f68a1 100644 --- a/src/base/unistd.h +++ b/src/base/unistd.h @@ -22,6 +22,9 @@ */ #ifndef PS_WINDOWS_UNISTD_H_ #define PS_WINDOWS_UNISTD_H_ + +#pragma warning(disable : 4996) + #include #include // #include "getopt.h" /* getopt at: https://gist.github.com/ashelly/7776712 */ diff --git a/src/base/utsname.h b/src/base/utsname.h index f32cda4e..d3139605 100644 --- a/src/base/utsname.h +++ b/src/base/utsname.h @@ -39,6 +39,8 @@ #ifndef UTSNAME_H_ #define UTSNAME_H_ +#pragma warning(disable : 4996) + #define WIN32_LEAN_AND_MEAN #include #include diff --git a/windows/xLearn.sln b/windows/xLearn.sln new file mode 100644 index 00000000..d1065718 --- /dev/null +++ b/windows/xLearn.sln @@ -0,0 +1,51 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.168 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xlearn_train", "xlearn_train\xlearn_train.vcxproj", "{FD705045-26E1-4204-AEF2-621368DAFE45}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xlearn_predict", "xlearn_predict\xlearn_predict.vcxproj", "{F892F54F-DA03-4C29-AB09-0F7966CCDA31}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xlearn_api", "xlearn_api\xlearn_api.vcxproj", "{70B829CF-DDA3-485E-A910-CD8B2DDECA80}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FD705045-26E1-4204-AEF2-621368DAFE45}.Debug|x64.ActiveCfg = Debug|x64 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Debug|x64.Build.0 = Debug|x64 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Debug|x86.ActiveCfg = Debug|Win32 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Debug|x86.Build.0 = Debug|Win32 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Release|x64.ActiveCfg = Release|x64 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Release|x64.Build.0 = Release|x64 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Release|x86.ActiveCfg = Release|Win32 + {FD705045-26E1-4204-AEF2-621368DAFE45}.Release|x86.Build.0 = Release|Win32 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Debug|x64.ActiveCfg = Debug|x64 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Debug|x64.Build.0 = Debug|x64 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Debug|x86.ActiveCfg = Debug|Win32 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Debug|x86.Build.0 = Debug|Win32 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Release|x64.ActiveCfg = Release|x64 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Release|x64.Build.0 = Release|x64 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Release|x86.ActiveCfg = Release|Win32 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31}.Release|x86.Build.0 = Release|Win32 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Debug|x64.ActiveCfg = Debug|x64 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Debug|x64.Build.0 = Debug|x64 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Debug|x86.ActiveCfg = Debug|Win32 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Debug|x86.Build.0 = Debug|Win32 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Release|x64.ActiveCfg = Release|x64 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Release|x64.Build.0 = Release|x64 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Release|x86.ActiveCfg = Release|Win32 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A264F9F9-595E-4008-8E04-A7FACAF5BC3E} + EndGlobalSection +EndGlobal diff --git a/windows/xlearn_api/xlearn_api.vcxproj b/windows/xlearn_api/xlearn_api.vcxproj new file mode 100644 index 00000000..9f0023b3 --- /dev/null +++ b/windows/xlearn_api/xlearn_api.vcxproj @@ -0,0 +1,206 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {70B829CF-DDA3-485E-A910-CD8B2DDECA80} + xlearnapi + 10.0.17763.0 + + + + DynamicLibrary + true + v141 + MultiByte + + + DynamicLibrary + false + v141 + true + MultiByte + + + DynamicLibrary + true + v141 + MultiByte + + + DynamicLibrary + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/xlearn_api/xlearn_api.vcxproj.filters b/windows/xlearn_api/xlearn_api.vcxproj.filters new file mode 100644 index 00000000..9ed10030 --- /dev/null +++ b/windows/xlearn_api/xlearn_api.vcxproj.filters @@ -0,0 +1,225 @@ + + + + + {1ba43176-8b02-4790-a713-c707dc1abed6} + + + {21d81980-7c5a-4983-96ad-509795c0e9a0} + + + {ee6c1683-16be-4ca8-97ec-5f4e50d2c388} + + + {95f8d793-241a-48da-8c5c-0c50bde04730} + + + {5aae936c-ebfe-45be-a64e-63284e4daeb5} + + + {31098655-17e4-430b-9288-dbc3535809f5} + + + {23ad8980-5673-4e45-91a2-1b71630c3cc0} + + + {3eb1a849-005c-44aa-b6cf-21293e4efa85} + + + {fc5e839f-531b-4e19-b4df-cb6235fe54b2} + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\data + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + \ No newline at end of file diff --git a/windows/xlearn_predict/xlearn_predict.vcxproj b/windows/xlearn_predict/xlearn_predict.vcxproj new file mode 100644 index 00000000..45ceff99 --- /dev/null +++ b/windows/xlearn_predict/xlearn_predict.vcxproj @@ -0,0 +1,207 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {F892F54F-DA03-4C29-AB09-0F7966CCDA31} + xlearnpredict + 10.0.17763.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/xlearn_predict/xlearn_predict.vcxproj.filters b/windows/xlearn_predict/xlearn_predict.vcxproj.filters new file mode 100644 index 00000000..f7d55f17 --- /dev/null +++ b/windows/xlearn_predict/xlearn_predict.vcxproj.filters @@ -0,0 +1,228 @@ + + + + + {4a227512-09e4-4769-b5fd-8cdcbe72f720} + + + {5f7b595a-40ce-4bb5-8ad6-d3b2b28b7e44} + + + {562e4cc3-3785-4a36-a590-b0fb94d885d6} + + + {2590c0d0-fc6a-4c4d-9013-9e4f0c4bc50c} + + + {0925ac12-9624-42fe-9e04-4bfe457fe894} + + + {d14fd247-3cfd-4094-a5f7-e07ac29b357d} + + + {8c72aaec-70bb-40c4-bba6-8a04e504c744} + + + {eed23268-c395-4d76-875a-517980b62b19} + + + {058de33b-8111-473a-8029-39d844074111} + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\data + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + \ No newline at end of file diff --git a/windows/xlearn_train/xlearn_train.vcxproj b/windows/xlearn_train/xlearn_train.vcxproj new file mode 100644 index 00000000..44f6376a --- /dev/null +++ b/windows/xlearn_train/xlearn_train.vcxproj @@ -0,0 +1,207 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {FD705045-26E1-4204-AEF2-621368DAFE45} + xlearntrain + 10.0.17763.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\; + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + true + true + + + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/xlearn_train/xlearn_train.vcxproj.filters b/windows/xlearn_train/xlearn_train.vcxproj.filters new file mode 100644 index 00000000..fcd4959c --- /dev/null +++ b/windows/xlearn_train/xlearn_train.vcxproj.filters @@ -0,0 +1,228 @@ + + + + + {0592b733-930d-4743-a186-b60f53c0983d} + + + {20af0d27-8b40-4a4d-bd6f-85273c63ffe2} + + + {a04ac42b-343e-438c-a94d-87a133dd2b4b} + + + {04a15749-dc8e-433c-96e3-fd1aa6e36f62} + + + {2ce9d0b6-d8a3-41c6-9109-cf2faf226be9} + + + {a3669496-2948-48e1-81f9-523e8b774ccc} + + + {1481e781-12d5-42f4-8a8a-ef35eade6979} + + + {78ee8558-1e50-4d53-a09c-42872ee8102c} + + + {47c80e64-02e6-4e24-9c64-0de50d0f3e9c} + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\data + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\base + + + src\c_api + + + src\c_api + + + src\data + + + src\distributed + + + src\loss + + + src\loss + + + src\loss + + + src\loss + + + src\reader + + + src\reader + + + src\reader + + + src\score + + + src\score + + + src\score + + + src\score + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + src\solver + + + \ No newline at end of file From 3ce4b83eb2c1dc56905d8c7d5bcaf6c3f292e90d Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 17:40:48 +0800 Subject: [PATCH 07/87] supplement CI script --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 55c02b75..fc9fb1bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ build_script: MSBuild xLearn.sln /p:Configuration=Release && cd python-package && C:\\Python36-x64\\Scripts\\pip install wheel numpy scipy scikit-learn cython pandas && - C:\\Python36-x64\\python.exe setup.py bdist_wheel --python-tag py3 + C:\\Python36-x64\\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && From 10e9015927119d479771ea1d7b64acfe469d6c08 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 18:36:31 +0800 Subject: [PATCH 08/87] supplement CI script --- .travis.yml | 15 ++++++++------- appveyor.yml | 17 ++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93ea6751..9c05038b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ compiler: gcc sudo: required install: true script: - - ./build-travis.sh - - cd build/test/ - - ./run_all_test.sh - - cd ../python-package/test/ - - pip3 install scikit-learn cython pandas - - python3 test_python.py - - python3 test_data_conversion.py + # - ./build-travis.sh + # - cd build/test/ + # - ./run_all_test.sh + # - cd ../python-package/test/ + # - pip3 install scikit-learn cython pandas + # - python3 test_python.py + # - python3 test_data_conversion.py + - pip3.6 --list diff --git a/appveyor.yml b/appveyor.yml index fc9fb1bc..be0b088c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,13 +10,16 @@ build_script: test_script: cd ..\test && .\run_all_test.bat && - cd ..\python-package\test && - C:\\Python36-x64\\python.exe test_data_conversion.py && - C:\\Python36-x64\\python.exe test_python.py && - C:\\Python35-x64\\python.exe test_data_conversion.py && - C:\\Python35-x64\\python.exe test_python.py && - C:\\Python34-x64\\python.exe test_data_conversion.py && - C:\\Python34-x64\\python.exe test_python.py + cd ..\python-package && + C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\\Python36-x64\\python.exe test\test_data_conversion.py && + C:\\Python36-x64\\python.exe test\test_python.py && + C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\\Python35-x64\\python.exe test\test_data_conversion.py && + C:\\Python35-x64\\python.exe test\test_python.py && + C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\\Python34-x64\\python.exe test\test_data_conversion.py && + C:\\Python34-x64\\python.exe test\test_python.py artifacts: - path: build_win\Release\*.exe name: Bits From b2dbbbf3477fa04fe3c96ccd881be4cd43e52d90 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 20:40:13 +0800 Subject: [PATCH 09/87] Update appveyor.yml --- appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index be0b088c..b4dda04a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,21 +5,21 @@ build_script: cmake -G "Visual Studio 15 Win64" ../ && MSBuild xLearn.sln /p:Configuration=Release && cd python-package && - C:\\Python36-x64\\Scripts\\pip install wheel numpy scipy scikit-learn cython pandas && - C:\\Python36-x64\\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && - C:\\Python36-x64\\python.exe test\test_data_conversion.py && - C:\\Python36-x64\\python.exe test\test_python.py && - C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && - C:\\Python35-x64\\python.exe test\test_data_conversion.py && - C:\\Python35-x64\\python.exe test\test_python.py && - C:\\Python36-x64\\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && - C:\\Python34-x64\\python.exe test\test_data_conversion.py && - C:\\Python34-x64\\python.exe test\test_python.py + C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python36-x64\python.exe test\test_data_conversion.py && + C:\Python36-x64\python.exe test\test_python.py && + C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python35-x64\python.exe test\test_data_conversion.py && + C:\Python35-x64\python.exe test\test_python.py && + C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python34-x64\python.exe test\test_data_conversion.py && + C:\Python34-x64\python.exe test\test_python.py artifacts: - path: build_win\Release\*.exe name: Bits From 6e6a95eceaf4e846fc461a9d89d51af471c69d39 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 20:50:11 +0800 Subject: [PATCH 10/87] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c05038b..b7db5e65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ script: # - pip3 install scikit-learn cython pandas # - python3 test_python.py # - python3 test_data_conversion.py - - pip3.6 --list + - pip3.6.3 --list From 1aa43f932dbfcbd7efc6960d63b1823107b94117 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 20:53:05 +0800 Subject: [PATCH 11/87] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b4dda04a..ad15d500 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,13 +11,13 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python36-x64\Scripts\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && C:\Python36-x64\python.exe test\test_data_conversion.py && C:\Python36-x64\python.exe test\test_python.py && - C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python36-x64\Scripts\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && C:\Python35-x64\python.exe test\test_data_conversion.py && C:\Python35-x64\python.exe test\test_python.py && - C:\Python36-x64\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + C:\Python36-x64\Scripts\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && C:\Python34-x64\python.exe test\test_data_conversion.py && C:\Python34-x64\python.exe test\test_python.py artifacts: From 2f53c9ce62748d965940aeefe9e42834976e3a8a Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:24:15 +0800 Subject: [PATCH 12/87] Update appveyor.yml --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ad15d500..115a1b2c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,13 +11,16 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - C:\Python36-x64\Scripts\pip install dist\xlearn_win-0.4.3-py3-none-win_amd64.whl && + dir dist\*.whl /B>whl_name && + set /p wname= Date: Tue, 16 Apr 2019 21:36:59 +0800 Subject: [PATCH 13/87] Update appveyor.yml --- appveyor.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 115a1b2c..0dd8de92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,18 +11,19 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - dir dist\*.whl /B>whl_name && - set /p wname=whl_name && +# set /p wname= Date: Tue, 16 Apr 2019 21:39:45 +0800 Subject: [PATCH 14/87] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7db5e65..51e44018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ script: # - pip3 install scikit-learn cython pandas # - python3 test_python.py # - python3 test_data_conversion.py - - pip3.6.3 --list + - pip3 --list From 650f8c9f27927f7481887417bf051eeb3e49ee2a Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:41:35 +0800 Subject: [PATCH 15/87] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 51e44018..cb16dee6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,5 @@ script: # - pip3 install scikit-learn cython pandas # - python3 test_python.py # - python3 test_data_conversion.py - - pip3 --list + - pip --list + - python --version From 2f39616814e6f7b7181c9839e2f7a3f05855ff27 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:44:11 +0800 Subject: [PATCH 16/87] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb16dee6..6d986493 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ script: # - pip3 install scikit-learn cython pandas # - python3 test_python.py # - python3 test_data_conversion.py - - pip --list - - python --version +# - pip --list + - python3 --version From ce1ffbcea14765f30b66ff4d95cc58a1523a867c Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:46:18 +0800 Subject: [PATCH 17/87] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6d986493..c339b078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,6 @@ script: # - python3 test_python.py # - python3 test_data_conversion.py # - pip --list + - apt install python3-pip + - pip3 list - python3 --version From 97262ea0c61ca7a591df22f5522db93f151c50e1 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:47:33 +0800 Subject: [PATCH 18/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0dd8de92..c7a337fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - dir + dir dist # dir dist\*.whl /B>whl_name && # set /p wname= Date: Tue, 16 Apr 2019 21:49:36 +0800 Subject: [PATCH 19/87] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c339b078..fd09e0a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,6 @@ script: # - python3 test_python.py # - python3 test_data_conversion.py # - pip --list - - apt install python3-pip + - sudo apt install python3-pip - pip3 list - python3 --version From ffc0246f113c3508f7a603143313bac3ae73d9f9 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 21:53:11 +0800 Subject: [PATCH 20/87] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd09e0a5..7bf0d8e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,6 @@ script: # - python3 test_python.py # - python3 test_data_conversion.py # - pip --list - - sudo apt install python3-pip + - sudo apt install python3.6 - pip3 list - python3 --version From 6eaabb33f226f8f3b8ae45511f9bb00579961dad Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 22:00:03 +0800 Subject: [PATCH 21/87] add python test --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bf0d8e5..b818d9a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,14 +3,12 @@ compiler: gcc sudo: required install: true script: - # - ./build-travis.sh - # - cd build/test/ - # - ./run_all_test.sh - # - cd ../python-package/test/ - # - pip3 install scikit-learn cython pandas - # - python3 test_python.py - # - python3 test_data_conversion.py -# - pip --list - - sudo apt install python3.6 - - pip3 list - - python3 --version + - ./build-travis.sh + - cd build/test/ + - ./run_all_test.sh + - cd ../python-package + - python setup.py install + - cd test/ + - pip install scikit-learn cython pandas + - python test_python.py + - python test_data_conversion.py From 40049089cd928e871c1f34688cbf65cfde55fadc Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 22:01:31 +0800 Subject: [PATCH 22/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c7a337fd..5eaa174b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - dir dist + dir dist\*.whl # dir dist\*.whl /B>whl_name && # set /p wname= Date: Tue, 16 Apr 2019 22:06:47 +0800 Subject: [PATCH 23/87] add python test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b818d9a1..3e15883e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ script: - cd build/test/ - ./run_all_test.sh - cd ../python-package - - python setup.py install + - sudo python setup.py install - cd test/ - - pip install scikit-learn cython pandas + - sudo pip install scikit-learn cython pandas - python test_python.py - python test_data_conversion.py From a7c8f21350fd747244347d559bd86f12da8c7a2d Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 22:13:32 +0800 Subject: [PATCH 24/87] Update appveyor.yml --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5eaa174b..33dffaff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,10 +11,10 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && - dir dist\*.whl -# dir dist\*.whl /B>whl_name && -# set /p wname=whl_name && + set /p wname= Date: Tue, 16 Apr 2019 22:24:54 +0800 Subject: [PATCH 25/87] Update appveyor.yml --- appveyor.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 33dffaff..65b72f05 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,17 +1,18 @@ image: Visual Studio 2017 build_script: - mkdir build_win && - cd build_win && - cmake -G "Visual Studio 15 Win64" ../ && - MSBuild xLearn.sln /p:Configuration=Release && - cd python-package && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && - C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 +# mkdir build_win && +# cd build_win && +# cmake -G "Visual Studio 15 Win64" ../ && +# MSBuild xLearn.sln /p:Configuration=Release && +# cd python-package && +# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && +# C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: - cd ..\test && - .\run_all_test.bat && - cd ..\python-package && - dir dist\*.whl /B>whl_name && +# cd ..\test && +# .\run_all_test.bat && +# cd ..\python-package && +# dir dist\*.whl /B>whl_name && + dir scripts\*.txt /B>whl_name set /p wname= Date: Tue, 16 Apr 2019 22:25:40 +0800 Subject: [PATCH 26/87] Update appveyor.yml --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 65b72f05..705738dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ image: Visual Studio 2017 -build_script: +# build_script: # mkdir build_win && # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && @@ -25,8 +25,8 @@ test_script: # C:\Python36-x64\Scripts\pip install dist\%wname% && # C:\Python34-x64\python.exe test\test_data_conversion.py && # C:\Python34-x64\python.exe test\test_python.py -artifacts: - - path: build_win\Release\*.exe - name: Bits - - path: build_win\python-package\dist\*.whl - name: Bits +# artifacts: +# - path: build_win\Release\*.exe +# name: Bits +# - path: build_win\python-package\dist\*.whl +# name: Bits From ce416b3f079c7df20bcb55870eaf422c5c212972 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 22:32:52 +0800 Subject: [PATCH 27/87] Update appveyor.yml --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 705738dc..663b728b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ image: Visual Studio 2017 -# build_script: -# mkdir build_win && -# cd build_win && -# cmake -G "Visual Studio 15 Win64" ../ && +build_script: + mkdir build_win && + cd build_win && + cmake -G "Visual Studio 15 Win64" ../ # MSBuild xLearn.sln /p:Configuration=Release && # cd python-package && # C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && @@ -12,7 +12,7 @@ test_script: # .\run_all_test.bat && # cd ..\python-package && # dir dist\*.whl /B>whl_name && - dir scripts\*.txt /B>whl_name + dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:37:54 +0800 Subject: [PATCH 28/87] Update appveyor.yml --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 663b728b..ca0c92b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,8 +14,10 @@ test_script: # dir dist\*.whl /B>whl_name && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:40:40 +0800 Subject: [PATCH 29/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ca0c92b1..c8f6a78d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ test_script: # dir dist\*.whl /B>whl_name && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:43:05 +0800 Subject: [PATCH 30/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c8f6a78d..2803ad63 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ test_script: set /p wname= Date: Tue, 16 Apr 2019 22:45:53 +0800 Subject: [PATCH 31/87] Update appveyor.yml --- appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2803ad63..7040d808 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,21 +2,20 @@ image: Visual Studio 2017 build_script: mkdir build_win && cd build_win && - cmake -G "Visual Studio 15 Win64" ../ -# MSBuild xLearn.sln /p:Configuration=Release && -# cd python-package && -# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && -# C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 + cmake -G "Visual Studio 15 Win64" ../ && + MSBuild xLearn.sln /p:Configuration=Release && + cd python-package && + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: -# cd ..\test && -# .\run_all_test.bat && -# cd ..\python-package && -# dir dist\*.whl /B>whl_name && - dir ..\scripts\*.txt /B>whl_name && + cd ..\test && + .\run_all_test.bat && + cd ..\python-package && + dir dist\*.whl /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:48:12 +0800 Subject: [PATCH 32/87] Update appveyor.yml --- appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7040d808..139c0920 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,18 +2,17 @@ image: Visual Studio 2017 build_script: mkdir build_win && cd build_win && - cmake -G "Visual Studio 15 Win64" ../ && - MSBuild xLearn.sln /p:Configuration=Release && - cd python-package && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && - C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 + cmake -G "Visual Studio 15 Win64" ../ +# MSBuild xLearn.sln /p:Configuration=Release && +# cd python-package && +# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && +# C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && dir dist\*.whl /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:50:25 +0800 Subject: [PATCH 33/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 139c0920..e165783a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ test_script: dir dist\*.whl /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:53:14 +0800 Subject: [PATCH 34/87] Update appveyor.yml --- appveyor.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e165783a..bf854bc9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,11 @@ build_script: # C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && # C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: - cd ..\test && - .\run_all_test.bat && - cd ..\python-package && - dir dist\*.whl /B>whl_name && +# cd ..\test && +# .\run_all_test.bat && +# cd ..\python-package && +# dir dist\*.whl /B>whl_name && + dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:55:31 +0800 Subject: [PATCH 35/87] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bf854bc9..39d26076 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,8 @@ test_script: # dir dist\*.whl /B>whl_name && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:55:42 +0800 Subject: [PATCH 36/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 39d26076..d2fab9d5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ test_script: dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 22:57:43 +0800 Subject: [PATCH 37/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d2fab9d5..dfd5eacd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ test_script: dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 23:00:05 +0800 Subject: [PATCH 38/87] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index dfd5eacd..5f57d44d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,10 @@ test_script: # .\run_all_test.bat && # cd ..\python-package && # dir dist\*.whl /B>whl_name && + dir ..\scripts && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 23:00:59 +0800 Subject: [PATCH 39/87] Update appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5f57d44d..606a3411 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,6 @@ test_script: dir ..\scripts && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 23:03:24 +0800 Subject: [PATCH 40/87] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 606a3411..134de349 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,8 @@ test_script: dir ..\scripts && dir ..\scripts\*.txt /B>whl_name && set /p wname= Date: Tue, 16 Apr 2019 23:06:40 +0800 Subject: [PATCH 41/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 134de349..5888ae94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,8 +13,8 @@ test_script: # cd ..\python-package && # dir dist\*.whl /B>whl_name && dir ..\scripts && - dir ..\scripts\*.txt /B>whl_name && - set /p wname=whl_name.txt && + set /p wname= Date: Tue, 16 Apr 2019 23:09:44 +0800 Subject: [PATCH 42/87] Update appveyor.yml --- appveyor.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5888ae94..95848a68 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,11 +13,12 @@ test_script: # cd ..\python-package && # dir dist\*.whl /B>whl_name && dir ..\scripts && - dir ..\scripts\*.txt /B>whl_name.txt && - set /p wname=whl_name.txt && +# set /p wname= Date: Tue, 16 Apr 2019 23:24:00 +0800 Subject: [PATCH 43/87] Update appveyor.yml --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 95848a68..56297e48 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,10 +12,9 @@ test_script: # .\run_all_test.bat && # cd ..\python-package && # dir dist\*.whl /B>whl_name && - dir ..\scripts && - dir ..\scripts\*.txt /B -# dir ..\scripts\*.txt /B>whl_name.txt && -# set /p wname=whl_name.txt && + set/p wname= Date: Tue, 16 Apr 2019 23:28:53 +0800 Subject: [PATCH 44/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 56297e48..a26a5747 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ test_script: # dir dist\*.whl /B>whl_name && dir ..\scripts\*.txt /B>whl_name.txt && set/p wname= Date: Tue, 16 Apr 2019 23:30:38 +0800 Subject: [PATCH 45/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a26a5747..e4bb6cff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ test_script: # dir dist\*.whl /B>whl_name && dir ..\scripts\*.txt /B>whl_name.txt && set/p wname= Date: Tue, 16 Apr 2019 23:35:30 +0800 Subject: [PATCH 46/87] update --- appveyor.yml | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e4bb6cff..82e39ffd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,31 +3,25 @@ build_script: mkdir build_win && cd build_win && cmake -G "Visual Studio 15 Win64" ../ -# MSBuild xLearn.sln /p:Configuration=Release && -# cd python-package && -# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && -# C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 + MSBuild xLearn.sln /p:Configuration=Release && + cd python-package && + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 test_script: -# cd ..\test && -# .\run_all_test.bat && -# cd ..\python-package && + cd ..\test && + .\run_all_test.bat && + cd ..\python-package && # dir dist\*.whl /B>whl_name && - dir ..\scripts\*.txt /B>whl_name.txt && - set/p wname= Date: Tue, 16 Apr 2019 23:36:32 +0800 Subject: [PATCH 47/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 82e39ffd..7e71fa83 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ test_script: .\run_all_test.bat && cd ..\python-package && # dir dist\*.whl /B>whl_name && -# set/p wname= Date: Tue, 16 Apr 2019 23:37:34 +0800 Subject: [PATCH 48/87] Update appveyor.yml --- appveyor.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7e71fa83..f60ca973 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,10 +21,9 @@ test_script: C:\Python35-x64\python.exe test\test_python.py && C:\Python36-x64\Scripts\pip install dist\xlearn-0.4.3-py3-none-win_amd64.whl && C:\Python34-x64\python.exe test\test_data_conversion.py && - C:\Python34-x64\python.exe test\test_python.py - -# artifacts: -# - path: build_win\Release\*.exe -# name: Bits -# - path: build_win\python-package\dist\*.whl -# name: Bits + C:\Python34-x64\python.exe test\test_python.py +artifacts: + - path: build_win\Release\*.exe + name: Bits + - path: build_win\python-package\dist\*.whl + name: Bits From a5b195d725fa28fa8adab4245312b8f47a48b1cb Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 23:39:41 +0800 Subject: [PATCH 49/87] Update appveyor.yml --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f60ca973..7919b6e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,6 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package && -# dir dist\*.whl /B>whl_name && -# set/p wname= Date: Tue, 16 Apr 2019 23:41:10 +0800 Subject: [PATCH 50/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7919b6e1..7bb80025 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && cd build_win && - cmake -G "Visual Studio 15 Win64" ../ + cmake -G "Visual Studio 15 Win64" ../ && MSBuild xLearn.sln /p:Configuration=Release && cd python-package && C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && From 742e5af91f1f9a0c087fd6e0f37b65686142ac5b Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Tue, 16 Apr 2019 23:53:51 +0800 Subject: [PATCH 51/87] update CI scripts --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7bb80025..7eae7f5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,16 +10,16 @@ build_script: test_script: cd ..\test && .\run_all_test.bat && - cd ..\python-package && - C:\Python36-x64\Scripts\pip install dist\xlearn-0.4.3-py3-none-win_amd64.whl && - C:\Python36-x64\python.exe test\test_data_conversion.py && - C:\Python36-x64\python.exe test\test_python.py && - C:\Python36-x64\Scripts\pip install dist\xlearn-0.4.3-py3-none-win_amd64.whl && - C:\Python35-x64\python.exe test\test_data_conversion.py && - C:\Python35-x64\python.exe test\test_python.py && - C:\Python36-x64\Scripts\pip install dist\xlearn-0.4.3-py3-none-win_amd64.whl && - C:\Python34-x64\python.exe test\test_data_conversion.py && - C:\Python34-x64\python.exe test\test_python.py + cd ..\python-package\test && + C:\Python36-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && + C:\Python36-x64\python.exe test_data_conversion.py && + C:\Python36-x64\python.exe test_python.py && + C:\Python35-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && + C:\Python35-x64\python.exe test_data_conversion.py && + C:\Python35-x64\python.exe test_python.py && + C:\Python34-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && + C:\Python34-x64\python.exe test_data_conversion.py && + C:\Python34-x64\python.exe test_python.py artifacts: - path: build_win\Release\*.exe name: Bits From 976c0fb1ea04b0dae8f3684d67564243c00c9bbc Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 00:02:58 +0800 Subject: [PATCH 52/87] update --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7eae7f5b..4247c4ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,12 +11,15 @@ test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package\test && + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && C:\Python36-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && C:\Python36-x64\python.exe test_data_conversion.py && C:\Python36-x64\python.exe test_python.py && + C:\Python35-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && C:\Python35-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && C:\Python35-x64\python.exe test_data_conversion.py && C:\Python35-x64\python.exe test_python.py && + C:\Python34-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && C:\Python34-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && C:\Python34-x64\python.exe test_data_conversion.py && C:\Python34-x64\python.exe test_python.py From 972f954883d33f7f136f8eae72bd6ec5bb4b4b31 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 09:50:45 +0800 Subject: [PATCH 53/87] update --- appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4247c4ed..7d545862 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,11 +6,15 @@ build_script: MSBuild xLearn.sln /p:Configuration=Release && cd python-package && C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && - C:\Python36-x64\python.exe setup.py bdist_wheel --python-tag py3 --plat-name win_amd64 + C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package\test && + C:\Python27-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python27-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py2.py3-none-win_amd64.whl && + C:\Python27-x64\python.exe test_data_conversion.py && + C:\Python27-x64\python.exe test_python.py && C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && C:\Python36-x64\Scripts\pip install ..\dist\xlearn-0.4.3-py3-none-win_amd64.whl && C:\Python36-x64\python.exe test_data_conversion.py && From 6b558d026d4fc74c4a1b390ede7e5400305e531c Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:03:49 +0800 Subject: [PATCH 54/87] Update appveyor.yml --- appveyor.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7d545862..4de3d91f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,30 +1,34 @@ image: Visual Studio 2017 build_script: + cmd && mkdir build_win && cd build_win && - cmake -G "Visual Studio 15 Win64" ../ && - MSBuild xLearn.sln /p:Configuration=Release && - cd python-package && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && - C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 + cmake -G "Visual Studio 15 Win64" ../ +# MSBuild xLearn.sln /p:Configuration=Release && +# cd python-package && +# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && +# C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package\test && + dir /b ..\dist\*.whl>whlname && + set/p pykage= Date: Wed, 17 Apr 2019 10:17:56 +0800 Subject: [PATCH 55/87] update --- appveyor.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4de3d91f..7905a421 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,34 +1,33 @@ image: Visual Studio 2017 build_script: - cmd && mkdir build_win && cd build_win && - cmake -G "Visual Studio 15 Win64" ../ -# MSBuild xLearn.sln /p:Configuration=Release && -# cd python-package && -# C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && -# C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 + cmake -G "Visual Studio 15 Win64" ../ && + MSBuild xLearn.sln /p:Configuration=Release && + cd python-package && + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 test_script: cd ..\test && .\run_all_test.bat && cd ..\python-package\test && - dir /b ..\dist\*.whl>whlname && - set/p pykage= Date: Wed, 17 Apr 2019 10:22:15 +0800 Subject: [PATCH 56/87] Update appveyor.yml --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7905a421..05251699 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,20 +13,20 @@ test_script: cd ..\python-package\test && $pkage=Get-ChildItem -name ..\dist\*.whl && $pkagepath="..\dist\"+$pkage && - C:\Python27-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python27-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && C:\Python27-x64\Scripts\pip install $pkagepath && C:\Python27-x64\python.exe test_data_conversion.py && C:\Python27-x64\python.exe test_python.py && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && C:\Python36-x64\Scripts\pip install $pkagepath && C:\Python36-x64\python.exe test_data_conversion.py && C:\Python36-x64\python.exe test_python.py && - C:\Python35-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python35-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && C:\Python35-x64\Scripts\pip install $pkagepath && C:\Python35-x64\python.exe test_data_conversion.py && C:\Python35-x64\python.exe test_python.py && C:\Python34-x64\Scripts\pip install --upgrade setuptools && - C:\Python34-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python34-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && C:\Python34-x64\Scripts\pip install $pkagepath && C:\Python34-x64\python.exe test_data_conversion.py && C:\Python34-x64\python.exe test_python.py From 62f403c938125fe585743e35c67461d9af811afb Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:32:53 +0800 Subject: [PATCH 57/87] Update appveyor.yml --- appveyor.yml | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 05251699..e17d3655 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,35 +3,36 @@ build_script: mkdir build_win && cd build_win && cmake -G "Visual Studio 15 Win64" ../ && + Get-ChildItem -name . && MSBuild xLearn.sln /p:Configuration=Release && cd python-package && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython pandas && + C:\Python36-x64\Scripts\pip install wheel cython && C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 -test_script: - cd ..\test && - .\run_all_test.bat && - cd ..\python-package\test && - $pkage=Get-ChildItem -name ..\dist\*.whl && - $pkagepath="..\dist\"+$pkage && - C:\Python27-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && - C:\Python27-x64\Scripts\pip install $pkagepath && - C:\Python27-x64\python.exe test_data_conversion.py && - C:\Python27-x64\python.exe test_python.py && - C:\Python36-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && - C:\Python36-x64\Scripts\pip install $pkagepath && - C:\Python36-x64\python.exe test_data_conversion.py && - C:\Python36-x64\python.exe test_python.py && - C:\Python35-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && - C:\Python35-x64\Scripts\pip install $pkagepath && - C:\Python35-x64\python.exe test_data_conversion.py && - C:\Python35-x64\python.exe test_python.py && - C:\Python34-x64\Scripts\pip install --upgrade setuptools && - C:\Python34-x64\Scripts\pip install wheel numpy scipy scikit-learn cython && - C:\Python34-x64\Scripts\pip install $pkagepath && - C:\Python34-x64\python.exe test_data_conversion.py && - C:\Python34-x64\python.exe test_python.py -artifacts: - - path: build_win\Release\*.exe - name: Bits - - path: build_win\python-package\dist\*.whl - name: Bits +# test_script: +# cd ..\test && +# .\run_all_test.bat && +# cd ..\python-package\test && +# $pkage=Get-ChildItem -name ..\dist\*.whl && +# $pkagepath="..\dist\"+$pkage && +# C:\Python27-x64\Scripts\pip install $pkagepath && +# C:\Python27-x64\Scripts\pip install wheel scikit-learn cython && +# C:\Python27-x64\python.exe test_data_conversion.py && +# C:\Python27-x64\python.exe test_python.py && +# C:\Python36-x64\Scripts\pip install $pkagepath && +# C:\Python36-x64\Scripts\pip install wheel scikit-learn cython && +# C:\Python36-x64\python.exe test_data_conversion.py && +# C:\Python36-x64\python.exe test_python.py && +# C:\Python35-x64\Scripts\pip install $pkagepath && +# C:\Python35-x64\Scripts\pip install wheel scikit-learn cython && +# C:\Python35-x64\python.exe test_data_conversion.py && +# C:\Python35-x64\python.exe test_python.py && +# C:\Python34-x64\Scripts\pip install $pkagepath && +# C:\Python34-x64\Scripts\pip install --upgrade setuptools && +# C:\Python34-x64\Scripts\pip install wheel scikit-learn cython && +# C:\Python34-x64\python.exe test_data_conversion.py && +# C:\Python34-x64\python.exe test_python.py +# artifacts: +# - path: build_win\Release\*.exe +# name: Bits +# - path: build_win\python-package\dist\*.whl +# name: Bits From b624bb00b4d4457f6b5c3263e639f0860a6efb69 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:35:43 +0800 Subject: [PATCH 58/87] Update appveyor.yml --- appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e17d3655..a537cccc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,13 @@ image: Visual Studio 2017 build_script: mkdir build_win && - cd build_win && - cmake -G "Visual Studio 15 Win64" ../ && - Get-ChildItem -name . && - MSBuild xLearn.sln /p:Configuration=Release && - cd python-package && - C:\Python36-x64\Scripts\pip install wheel cython && - C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 + ls *.txt +# cd build_win && +# cmake -G "Visual Studio 15 Win64" ../ && +# MSBuild xLearn.sln /p:Configuration=Release && +# cd python-package && +# C:\Python36-x64\Scripts\pip install wheel cython && +# C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 # test_script: # cd ..\test && # .\run_all_test.bat && From ed3ff4ece01acee12823f94c3721ed6ca20e717b Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:36:26 +0800 Subject: [PATCH 59/87] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a537cccc..c7ec3171 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,8 @@ image: Visual Studio 2017 build_script: mkdir build_win && - ls *.txt + set a=`ls *.txt` + echo %a% # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && From ce46d3288d0334df5022c8fa155a754d6f419bb8 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:37:09 +0800 Subject: [PATCH 60/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c7ec3171..69005edf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ image: Visual Studio 2017 build_script: mkdir build_win && - set a=`ls *.txt` - echo %a% + set a=`ls *.txt` && + C:\Python36-x64\Scripts\pip install %a% # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && From 0502c47f6111aec660f645b91edd405dc5fd2d0e Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:39:41 +0800 Subject: [PATCH 61/87] Update appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 69005edf..b50e8874 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,9 @@ image: Visual Studio 2017 build_script: mkdir build_win && - set a=`ls *.txt` && - C:\Python36-x64\Scripts\pip install %a% + a=`ls *.txt` && + echo %a% && + C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && From 27ebad4e733aa031aa7fe62b87a1e75af65387dd Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:41:37 +0800 Subject: [PATCH 62/87] Update appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b50e8874..ad0f2203 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - echo %a% && C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 68aa6b52da8468515e8a586a3b120e5459eb8d19 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:42:27 +0800 Subject: [PATCH 63/87] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ad0f2203..a425d9c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,8 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - C:\Python36-x64\Scripts\pip install ${a} + a && +# C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && From 815da89a96156cc4618b0c851bb7d9ebf52651af Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:42:56 +0800 Subject: [PATCH 64/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a425d9c7..90f9f335 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - a && + echo a && # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 06aa0500f76bc7de2a8fa096663eb72cdcbd0c2d Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:43:26 +0800 Subject: [PATCH 65/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 90f9f335..045f1df4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - echo a && + %a% && # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 042298657f3df5fd7e453eaac1c7e315c446b0e0 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:43:54 +0800 Subject: [PATCH 66/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 045f1df4..27683f2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - %a% && + %a% # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From e900dc6d7094e43af2e2b06fad5720bb2a3d6316 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:44:46 +0800 Subject: [PATCH 67/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 27683f2f..06c91efe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && a=`ls *.txt` && - %a% + ${a} # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 9b286a3db4bc16496c6e75a93baea08702ac6cf1 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:47:26 +0800 Subject: [PATCH 68/87] Update appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 06c91efe..0cc9b59b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,9 @@ image: Visual Studio 2017 build_script: mkdir build_win && - a=`ls *.txt` && - ${a} + ps:$pkage=Get-ChildItem -name *.txt && + ps:$pkagepath="..\dist\"+$pkage && + ps:$pkagepath # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 0f087796988d0383323e66c6ad3943327dfe465e Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:48:29 +0800 Subject: [PATCH 69/87] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0cc9b59b..6036fb0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,9 @@ image: Visual Studio 2017 build_script: mkdir build_win && - ps:$pkage=Get-ChildItem -name *.txt && - ps:$pkagepath="..\dist\"+$pkage && - ps:$pkagepath + ps:Get-ChildItem -name *.txt +# ps:$pkagepath="..\dist\"+$pkage && +# ps:$pkagepath # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 0e4686d2ecb958a247b2f97c970442a89a063c74 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:50:28 +0800 Subject: [PATCH 70/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6036fb0a..6440d754 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2017 build_script: mkdir build_win && - ps:Get-ChildItem -name *.txt + - ps: Get-ChildItem -name *.txt # ps:$pkagepath="..\dist\"+$pkage && # ps:$pkagepath # C:\Python36-x64\Scripts\pip install ${a} From 5480335498085f59ebfd2c087e3c2c57827218b1 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:51:34 +0800 Subject: [PATCH 71/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6440d754..416a3f5d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2017 build_script: - mkdir build_win && - ps: Get-ChildItem -name *.txt +# mkdir build_win && # ps:$pkagepath="..\dist\"+$pkage && # ps:$pkagepath # C:\Python36-x64\Scripts\pip install ${a} From df9764a75ecb353c630f0c911edac6abe8e3403c Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:52:39 +0800 Subject: [PATCH 72/87] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 416a3f5d..02705d21 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,9 @@ image: Visual Studio 2017 build_script: - - ps: Get-ChildItem -name *.txt + - ps: $pkage=Get-ChildItem -name *.txt + - ps: $pkagepath="..\dist\"+$pkage + - ps: $pkagepath # mkdir build_win && -# ps:$pkagepath="..\dist\"+$pkage && -# ps:$pkagepath # C:\Python36-x64\Scripts\pip install ${a} # cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && From 008e5af6a62c3cdf6fda80fa13eb43c50bbdb22f Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:53:29 +0800 Subject: [PATCH 73/87] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 02705d21..a460ff3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,9 +3,9 @@ build_script: - ps: $pkage=Get-ChildItem -name *.txt - ps: $pkagepath="..\dist\"+$pkage - ps: $pkagepath -# mkdir build_win && -# C:\Python36-x64\Scripts\pip install ${a} -# cd build_win && + mkdir build_win && + -ps: C:\Python36-x64\Scripts\pip install $pkagepath + cd build_win && # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && # cd python-package && From e9430136cd88cbceabf3f25fadcad766a138ce93 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:54:06 +0800 Subject: [PATCH 74/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a460ff3c..839c465a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,8 @@ build_script: - ps: $pkagepath="..\dist\"+$pkage - ps: $pkagepath mkdir build_win && - -ps: C:\Python36-x64\Scripts\pip install $pkagepath - cd build_win && + C:\Python36-x64\Scripts\pip install $pkagepath && + cd build_win # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && # cd python-package && From 687b4c14f3341135f4eb77c2b8c566e3ea05f9d5 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:56:06 +0800 Subject: [PATCH 75/87] Update appveyor.yml --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 839c465a..4484164a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ image: Visual Studio 2017 build_script: - ps: $pkage=Get-ChildItem -name *.txt - - ps: $pkagepath="..\dist\"+$pkage - - ps: $pkagepath - mkdir build_win && - C:\Python36-x64\Scripts\pip install $pkagepath && - cd build_win + $pkagepath="..\dist\"+$pkage + $pkagepath +# mkdir build_win && +# C:\Python36-x64\Scripts\pip install $pkagepath && +# cd build_win # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && # cd python-package && From cd4c8421a06e17660b69e0e93fa2b92d380a1226 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:56:53 +0800 Subject: [PATCH 76/87] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4484164a..aa8decd9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,9 @@ image: Visual Studio 2017 build_script: - ps: $pkage=Get-ChildItem -name *.txt - $pkagepath="..\dist\"+$pkage - $pkagepath -# mkdir build_win && + -ps: $pkagepath="..\dist\"+$pkage + -ps: $pkagepath + mkdir build_win # C:\Python36-x64\Scripts\pip install $pkagepath && # cd build_win # cmake -G "Visual Studio 15 Win64" ../ && From c60447bd2f46272503dd7f8d59662521c627995d Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:57:24 +0800 Subject: [PATCH 77/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aa8decd9..e99d98b4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ image: Visual Studio 2017 build_script: - ps: $pkage=Get-ChildItem -name *.txt - -ps: $pkagepath="..\dist\"+$pkage - -ps: $pkagepath + - ps: $pkagepath="..\dist\"+$pkage + - ps: $pkagepath mkdir build_win # C:\Python36-x64\Scripts\pip install $pkagepath && # cd build_win From a05630328be4ea5f4e9c7e4404fcde765c3a9f07 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 10:58:13 +0800 Subject: [PATCH 78/87] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e99d98b4..49d4b616 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ build_script: - ps: $pkage=Get-ChildItem -name *.txt - ps: $pkagepath="..\dist\"+$pkage - ps: $pkagepath - mkdir build_win -# C:\Python36-x64\Scripts\pip install $pkagepath && + - ps: mkdir build_win + - ps: C:\Python36-x64\Scripts\pip install $pkagepath # cd build_win # cmake -G "Visual Studio 15 Win64" ../ && # MSBuild xLearn.sln /p:Configuration=Release && From 124eb5d028f253ba5d03b982783e4583076efcee Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 11:01:14 +0800 Subject: [PATCH 79/87] Update appveyor.yml --- appveyor.yml | 70 +++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 49d4b616..b78181b4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,41 +1,37 @@ image: Visual Studio 2017 build_script: - - ps: $pkage=Get-ChildItem -name *.txt - - ps: $pkagepath="..\dist\"+$pkage - - ps: $pkagepath - ps: mkdir build_win + - ps: cd build_win + - ps: cmake -G "Visual Studio 15 Win64" ../ + - ps: MSBuild xLearn.sln /p:Configuration=Release + - ps: cd python-package + - ps: C:\Python36-x64\Scripts\pip install wheel cython + - ps: C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 +test_script: + - ps: cd ..\tes + - ps: .\run_all_test.bat + - ps: cd ..\python-package\test + - ps: $pkage=Get-ChildItem -name ..\dist\*.whl + - ps: $pkagepath="..\dist\"+$pkage + - ps: C:\Python27-x64\Scripts\pip install $pkagepath + - ps: C:\Python27-x64\Scripts\pip install wheel scikit-learn cython + - ps: C:\Python27-x64\python.exe test_data_conversion.py + - ps: C:\Python27-x64\python.exe test_python.py - ps: C:\Python36-x64\Scripts\pip install $pkagepath -# cd build_win -# cmake -G "Visual Studio 15 Win64" ../ && -# MSBuild xLearn.sln /p:Configuration=Release && -# cd python-package && -# C:\Python36-x64\Scripts\pip install wheel cython && -# C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 -# test_script: -# cd ..\test && -# .\run_all_test.bat && -# cd ..\python-package\test && -# $pkage=Get-ChildItem -name ..\dist\*.whl && -# $pkagepath="..\dist\"+$pkage && -# C:\Python27-x64\Scripts\pip install $pkagepath && -# C:\Python27-x64\Scripts\pip install wheel scikit-learn cython && -# C:\Python27-x64\python.exe test_data_conversion.py && -# C:\Python27-x64\python.exe test_python.py && -# C:\Python36-x64\Scripts\pip install $pkagepath && -# C:\Python36-x64\Scripts\pip install wheel scikit-learn cython && -# C:\Python36-x64\python.exe test_data_conversion.py && -# C:\Python36-x64\python.exe test_python.py && -# C:\Python35-x64\Scripts\pip install $pkagepath && -# C:\Python35-x64\Scripts\pip install wheel scikit-learn cython && -# C:\Python35-x64\python.exe test_data_conversion.py && -# C:\Python35-x64\python.exe test_python.py && -# C:\Python34-x64\Scripts\pip install $pkagepath && -# C:\Python34-x64\Scripts\pip install --upgrade setuptools && -# C:\Python34-x64\Scripts\pip install wheel scikit-learn cython && -# C:\Python34-x64\python.exe test_data_conversion.py && -# C:\Python34-x64\python.exe test_python.py -# artifacts: -# - path: build_win\Release\*.exe -# name: Bits -# - path: build_win\python-package\dist\*.whl -# name: Bits + - ps: C:\Python36-x64\Scripts\pip install wheel scikit-learn cython + - ps: C:\Python36-x64\python.exe test_data_conversion.py + - ps: C:\Python36-x64\python.exe test_python.py + - ps: C:\Python35-x64\Scripts\pip install $pkagepath + - ps: C:\Python35-x64\Scripts\pip install wheel scikit-learn cython + - ps: C:\Python35-x64\python.exe test_data_conversion.py + - ps: C:\Python35-x64\python.exe test_python.py + - ps: C:\Python34-x64\Scripts\pip install $pkagepath + - ps: C:\Python34-x64\Scripts\pip install --upgrade setuptools + - ps: C:\Python34-x64\Scripts\pip install wheel scikit-learn cython + - ps: C:\Python34-x64\python.exe test_data_conversion.py + - ps: C:\Python34-x64\python.exe test_python.py +artifacts: + - path: build_win\Release\*.exe + name: Bits + - path: build_win\python-package\dist\*.whl + name: Bits From 83e294215b4639195e8025954245fbc7d81b9bf2 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 11:14:58 +0800 Subject: [PATCH 80/87] Update appveyor.yml --- appveyor.yml | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b78181b4..b227b601 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,35 +1,36 @@ image: Visual Studio 2017 build_script: - - ps: mkdir build_win - - ps: cd build_win - - ps: cmake -G "Visual Studio 15 Win64" ../ - - ps: MSBuild xLearn.sln /p:Configuration=Release - - ps: cd python-package - - ps: C:\Python36-x64\Scripts\pip install wheel cython - - ps: C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 + - cmd: mkdir build_win + - cmd: cd build_win + - cmd: cmake -G "Visual Studio 15 Win64" ../ + - cmd: MSBuild xLearn.sln /p:Configuration=Release + - cmd: cd python-package + - cmd: C:\Python36-x64\Scripts\pip install wheel cython + - cmd: C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 test_script: - - ps: cd ..\tes - - ps: .\run_all_test.bat - - ps: cd ..\python-package\test - - ps: $pkage=Get-ChildItem -name ..\dist\*.whl - - ps: $pkagepath="..\dist\"+$pkage - - ps: C:\Python27-x64\Scripts\pip install $pkagepath - - ps: C:\Python27-x64\Scripts\pip install wheel scikit-learn cython - - ps: C:\Python27-x64\python.exe test_data_conversion.py - - ps: C:\Python27-x64\python.exe test_python.py - - ps: C:\Python36-x64\Scripts\pip install $pkagepath - - ps: C:\Python36-x64\Scripts\pip install wheel scikit-learn cython - - ps: C:\Python36-x64\python.exe test_data_conversion.py - - ps: C:\Python36-x64\python.exe test_python.py - - ps: C:\Python35-x64\Scripts\pip install $pkagepath - - ps: C:\Python35-x64\Scripts\pip install wheel scikit-learn cython - - ps: C:\Python35-x64\python.exe test_data_conversion.py - - ps: C:\Python35-x64\python.exe test_python.py - - ps: C:\Python34-x64\Scripts\pip install $pkagepath - - ps: C:\Python34-x64\Scripts\pip install --upgrade setuptools - - ps: C:\Python34-x64\Scripts\pip install wheel scikit-learn cython - - ps: C:\Python34-x64\python.exe test_data_conversion.py - - ps: C:\Python34-x64\python.exe test_python.py + - cmd: cd ..\tes + - cmd: .\run_all_test.bat + - cmd: cd ..\python-package\test + - cmd: dir /b ..\dist\*.whl>whlname + - cmd: set/p pkage= Date: Wed, 17 Apr 2019 11:20:36 +0800 Subject: [PATCH 81/87] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b227b601..337e7b9b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ build_script: - cmd: C:\Python36-x64\Scripts\pip install wheel cython - cmd: C:\Python36-x64\python.exe setup.py bdist_wheel --universal --plat-name win_amd64 test_script: - - cmd: cd ..\tes + - cmd: cd ..\test - cmd: .\run_all_test.bat - cmd: cd ..\python-package\test - cmd: dir /b ..\dist\*.whl>whlname From 194733af2f32216117f3c07f31e45fd6b51ebfbf Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 11:28:21 +0800 Subject: [PATCH 82/87] fix a import bug --- python-package/xlearn/xlearn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-package/xlearn/xlearn.py b/python-package/xlearn/xlearn.py index 43fbe9ab..b3cfeaee 100644 --- a/python-package/xlearn/xlearn.py +++ b/python-package/xlearn/xlearn.py @@ -17,7 +17,7 @@ import os import ctypes from numpy import ndarray -from pandas import DataFrame +from .base import Series, DataFrame import numpy as np from .base import _LIB, XLearnHandle from .base import _check_call, c_str From d8e9d9b98479bcb6e75889e1742c8ceeb46e8128 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 11:37:58 +0800 Subject: [PATCH 83/87] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 337e7b9b..4d1285de 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,6 +26,7 @@ test_script: - cmd: C:\Python35-x64\Scripts\pip install wheel scikit-learn cython - cmd: C:\Python35-x64\python.exe test_data_conversion.py - cmd: C:\Python35-x64\python.exe test_python.py + - cmd: set VS100COMNTOOLS=%VS140COMNTOOLS% - cmd: C:\Python34-x64\Scripts\pip install %pkagepath% - cmd: C:\Python34-x64\Scripts\pip install --upgrade setuptools - cmd: C:\Python34-x64\Scripts\pip install wheel scikit-learn cython From 8c2ab7b19e086ed4bcfcda4ee9d27622bc7b76b6 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 12:30:15 +0800 Subject: [PATCH 84/87] update --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 4d1285de..07118c75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,10 @@ test_script: - cmd: C:\Python27-x64\Scripts\pip install wheel scikit-learn cython - cmd: C:\Python27-x64\python.exe test_data_conversion.py - cmd: C:\Python27-x64\python.exe test_python.py + - cmd: C:\Python37-x64\Scripts\pip install %pkagepath% + - cmd: C:\Python37-x64\Scripts\pip install wheel scikit-learn cython + - cmd: C:\Python37-x64\python.exe test_data_conversion.py + - cmd: C:\Python37-x64\python.exe test_python.py - cmd: C:\Python36-x64\Scripts\pip install %pkagepath% - cmd: C:\Python36-x64\Scripts\pip install wheel scikit-learn cython - cmd: C:\Python36-x64\python.exe test_data_conversion.py From f6623c93a8ff7f455321a1ee00d308b10d9884f5 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 13:17:25 +0800 Subject: [PATCH 85/87] update doc --- doc/install_windows.rst | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/install_windows.rst b/doc/install_windows.rst index 83122f94..815da222 100644 --- a/doc/install_windows.rst +++ b/doc/install_windows.rst @@ -53,6 +53,13 @@ Users can test the installation by using the following command: :: run_example.bat +Build from VS solution +======================= +We support an vs solution for users, it's in the directory ``windows`` which is in root of xLearn project. There are three vs project +in this solution: ``xlearn_train``, ``xlearn_test``, ``xlearn_api``, respectively relation to build executable train,predict entry program and DLL(dynamic link library) API for windows. You should make sure that your vs platform toolset is greater than v141(It works well if you use vs2017). + +**Note:** Files(both executable file and DLL) compiling from this solution is different from cmake solution, because of different structure. + Install Python Package ======================= @@ -81,9 +88,12 @@ You should make sure that you enter DOS as Administrator. Install xLearn from pip ^^^^^^^^^^^^^^^^^^^^^^^^ -We will update Python package for Windows soon later. +We provide Python package on Windows, it supports these Python(x64) versions: ``2.7, 3.4, 3.5, 3.6, 3.7``. + +Users can download this binary python package from tab release_, then use ``pip`` command install the ``.whl`` file which you download. + +.. _release: https://github.com/aksnzhy/xlearn/releases -The installation process will take a while to complete. After that, you can type the following script in your python shell to check whether the xLearn has been installed successfully: :: >>> import xlearn as xl @@ -99,5 +109,5 @@ You will see the following message if the installation is successful: :: > <| |___| __/ (_| | | | | | | /_/\_\_____/\___|\__,_|_| |_| |_| - xLearn -- 0.42 Version -- + xLearn -- 0.43 Version -- ------------------------------------------------------------------------- From 8f72e95cb2930d54cab05f8bccb3c2623c62d873 Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 13:21:34 +0800 Subject: [PATCH 86/87] update doc --- doc/install_windows.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/install_windows.rst b/doc/install_windows.rst index 815da222..7b64749c 100644 --- a/doc/install_windows.rst +++ b/doc/install_windows.rst @@ -53,9 +53,11 @@ Users can test the installation by using the following command: :: run_example.bat -Build from VS solution +Build from Visual Studio solution ======================= -We support an vs solution for users, it's in the directory ``windows`` which is in root of xLearn project. There are three vs project +This build method is optional for Build from Source Code, if you already use method above, you can skip this part. + +We support an Visual Studio(vs) solution for users, it's in the directory ``windows`` which is in root of xLearn project. There are three vs project in this solution: ``xlearn_train``, ``xlearn_test``, ``xlearn_api``, respectively relation to build executable train,predict entry program and DLL(dynamic link library) API for windows. You should make sure that your vs platform toolset is greater than v141(It works well if you use vs2017). **Note:** Files(both executable file and DLL) compiling from this solution is different from cmake solution, because of different structure. From eda2ea649e5767858f9d96498f63c5a7b86d476a Mon Sep 17 00:00:00 2001 From: etVERITAS Date: Wed, 17 Apr 2019 13:23:05 +0800 Subject: [PATCH 87/87] udpate doc --- doc/install_windows.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/install_windows.rst b/doc/install_windows.rst index 7b64749c..6595c79c 100644 --- a/doc/install_windows.rst +++ b/doc/install_windows.rst @@ -57,8 +57,11 @@ Build from Visual Studio solution ======================= This build method is optional for Build from Source Code, if you already use method above, you can skip this part. -We support an Visual Studio(vs) solution for users, it's in the directory ``windows`` which is in root of xLearn project. There are three vs project -in this solution: ``xlearn_train``, ``xlearn_test``, ``xlearn_api``, respectively relation to build executable train,predict entry program and DLL(dynamic link library) API for windows. You should make sure that your vs platform toolset is greater than v141(It works well if you use vs2017). +We support an Visual Studio(vs) solution for users, it's in the directory ``windows`` which is in root of xLearn project. + +There are three vs project in this solution: ``xlearn_train``, ``xlearn_test``, ``xlearn_api``, respectively relation to build executable train,predict entry program and DLL(dynamic link library) API for windows. + +Users should make sure that your vs platform toolset is greater than v141(It works well if you use vs2017). **Note:** Files(both executable file and DLL) compiling from this solution is different from cmake solution, because of different structure.