address cr comments

contrib/PythonV2/cntk/setup.py

@@ -14,7 +14,7 @@ ext_modules = [
     Extension(
            name="_cntk_py",
 
-           sources=[os.path.join("wrap", "cntk_py_wrap.cxx")],
+           sources=[os.path.join("swig", "cntk_py_wrap.cxx")],
 
            libraries=[
                os.path.join(CNTK_LIB_PATH, "CNTKLibrary-2.0"),

contrib/PythonV2/cntk/swig/cntk_py_tester.py

@@ -1,7 +1,7 @@
 import numpy as np
 import sys
 import os
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 import cntk.cntk_py as cntk_py
 
 # class MyVariable(cntk_py.Variable):

contrib/PythonV2/cntk/swig/test_wrapper.py

@@ -1,10 +1,12 @@
 import pytest
-
+import sys
 import numpy as np
-from cntk import cntk_py
+import os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+import cntk.cntk_py as cntk_py
 from cntk.ops import variable, constant
 from cntk.tests.test_utils import *
-from ..utils import sanitize_batch, remove_masked_elements, pad_to_dense, precision_numpy, cntk_device
+from cntk.utils import sanitize_batch, remove_masked_elements, pad_to_dense, precision_numpy, cntk_device
 
 def create_Value_with_value(shape, data_type, value, dev):
     if data_type == cntk_py.DataType_Float:

contrib/PythonV2/setup.py

@@ -1,17 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-
-# Licensed under the MIT license. See LICENSE.md file in the project root 
-# for full license information.
-# ==============================================================================
-
-from distutils.core import setup
-
-setup(name='CNTK',
-      version='1.5',
-      description='CNTK',
-      author='Microsoft',
-      author_email='deepblis@microsoft.com',
-      url='cntk.ai',
-      packages=['cntk', 'cntk.examples', 'cntk.tests', 'cntk.utils', 'cntk.ops'],
-      package_data={'cntk': ['templates/*.cntk']}
-     )

contrib/PythonV2/setup_sh.ps

@@ -1 +0,0 @@
-$Env:CNTK_EXECUTABLE_PATH = 'c:\blis\cntk-bin\cntk\cntk.exe'