Appveyor: build zfpy on MSVC release builds with python 2.7 and 3.5 (expect zfpy failures on MSVC)

change zfpy target dir to be bin/ and update PYTHONPATH for tests

Author: salasoom

appveyor.sh

@@ -18,7 +18,23 @@ BUILD_FLAGS="$BUILD_FLAGS -DBUILD_UTILITIES=ON"
 BUILD_FLAGS="$BUILD_FLAGS -DBUILD_EXAMPLES=ON"
 BUILD_FLAGS="$BUILD_FLAGS -DBUILD_CFP=ON"
 BUILD_FLAGS="$BUILD_FLAGS -DCFP_NAMESPACE=cfp2"
-BUILD_FLAGS="$BUILD_FLAGS -DZFP_WITH_ALIGNED_ALLOC=ON"
+
+# zfpy only built for MSVC, Release builds
+if [ $COMPILER == "msvc" ] && [ $BUILD_TYPE == "Release" ]; then
+  # verify active python version matches what was specified in appveyor.yml
+
+  # fetch python version X.Y (single digits only)
+  ACTIVE_PY_VERSION=$(python -c 'import platform; print(platform.python_version())' | cut -c1-3)
+  # $PYTHON_VERSION comes from appveyor.yml and has form XY (no dot separating major and minor versions)
+  ACTIVE_PY_VERSION=${ACTIVE_PY_VERSION:0:1}${ACTIVE_PY_VERSION:2:1}
+
+  if [ $ACTIVE_PY_VERSION != $PYTHON_VERSION ]; then
+    exit 1
+  fi
+
+  BUILD_FLAGS="$BUILD_FLAGS -DBUILD_ZFPY=ON"
+fi
+
 BUILD_FLAGS="$BUILD_FLAGS -DBUILD_OPENMP=OFF"
 BUILD_FLAGS="$BUILD_FLAGS -DBUILD_CUDA=OFF"
 

appveyor.yml

@@ -1,6 +1,7 @@
 version: 0.5.5-{build}
 
 environment:
+  # zfpy only build for Release builds (otherwise need debug python libs python27_d.lib)
   matrix:
     - COMPILER: mingw
       GENERATOR: MinGW Makefiles
@@ -33,6 +34,7 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PLATFORM: x64
       BUILD_TYPE: Release
+      PYTHON_VERSION: 35
 
     - COMPILER: msvc
       GENERATOR: Visual Studio 15 2017
@@ -45,6 +47,7 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PLATFORM: Win32
       BUILD_TYPE: Release
+      PYTHON_VERSION: 35
 
     - COMPILER: msvc
       GENERATOR: Visual Studio 14 2015 Win64
@@ -55,6 +58,7 @@ environment:
       GENERATOR: Visual Studio 14 2015 Win64
       PLATFORM: x64
       BUILD_TYPE: Release
+      PYTHON_VERSION: 35
 
     - COMPILER: msvc
       GENERATOR: Visual Studio 14 2015
@@ -65,10 +69,31 @@ environment:
       GENERATOR: Visual Studio 14 2015
       PLATFORM: Win32
       BUILD_TYPE: Release
+      PYTHON_VERSION: 27
 
 install:
   - if "%COMPILER%"=="mingw" set PATH=C:\MinGW\bin;%PATH%
   - if "%COMPILER%"=="mingw-w64" set PATH=C:\MinGW\bin;%PATH%
 
+  # set env vars for Python system dir (assumed to always be MSVC)
+  - ps: |
+      if ($env:PYTHON_VERSION) {
+        $env:PYTHON_DIR = "C:\Python$env:PYTHON_VERSION"
+        if ($env:PLATFORM -eq "x64") {
+          $env:PYTHON_DIR = "$env:PYTHON_DIR-x64"
+        }
+
+        $env:PYTHON_LIB_PATH = "$env:PYTHON_DIR\libs\python$env:PYTHON_VERSION.lib"
+      }
+
+  # placing these behind a conditional for some reason prevents CMake from picking up the virtualenv
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" set PATH=%PYTHON_DIR%;%PYTHON_DIR%\Scripts;%PATH%
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" pip install virtualenv
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" set VIRTUALENV_NAME=pyVirtualEnv
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" virtualenv %VIRTUALENV_NAME%
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" "%VIRTUALENV_NAME%\\Scripts\\activate.bat"
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" pip install -r python\requirements.txt
+  - if "%COMPILER%"=="msvc" if "%BUILD_TYPE%"=="Release" python --version
+
 build_script:
   - sh appveyor.sh

cmake/appveyor.cmake

@@ -11,7 +11,9 @@ set(CTEST_SITE "appveyor")
 set(CTEST_CMAKE_GENERATOR "${GENERATOR}")
 set(CTEST_BUILD_NAME "$ENV{APPVEYOR_REPO_BRANCH}-${job_details}")
 set(cfg_options
+  -DCMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
   -DBUILD_CFP=${BUILD_CFP}
+  -DBUILD_ZFPY=${BUILD_ZFPY}
   -DZFP_WITH_OPENMP=${BUILD_OPENMP}
   -DZFP_WITH_CUDA=${BUILD_CUDA}
   )
@@ -46,6 +48,19 @@ if(BUILD_CFP)
   endif()
 endif()
 
+if(BUILD_ZFPY)
+  set(CTEST_SITE "${CTEST_SITE}_zfpy$ENV{PYTHON_VERSION}")
+
+  # sanitize python include dir path (ex. windows vs linux slashes)
+  set(PYTHON_INCLUDE_DIR "")
+  file(TO_CMAKE_PATH "${CTEST_SOURCE_DIRECTORY}\\$ENV{VIRTUALENV_NAME}\\Include" PYTHON_INCLUDE_DIR)
+
+  list(APPEND cfg_options
+    -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}
+    -DPYTHON_LIBRARY=$ENV{PYTHON_LIB_PATH}
+    )
+endif()
+
 if(OMP_TESTS_ONLY)
   list(APPEND cfg_options
     -DZFP_OMP_TESTS_ONLY=1

python/CMakeLists.txt

@@ -19,7 +19,7 @@ target_link_libraries(zfpy zfp)
 python_extension_module(zfpy)
 
 # Build to the currrent binary dir to avoid conflicts with other libraries named zfp
-set(PYLIB_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/lib" CACHE PATH "Directory where zfp python library will be built")
+set(PYLIB_BUILD_DIR "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Directory where zfp python library will be built")
 set_target_properties(zfpy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYLIB_BUILD_DIR})
 # Install to the typical python module directory
 set(python_install_lib_dir "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/")

tests/python/CMakeLists.txt

@@ -20,9 +20,18 @@ target_link_libraries(test_utils zfp genSmoothRandNumsLib stridedOperationsLib z
 python_extension_module(test_utils)
 set_target_properties(test_utils PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYLIB_BUILD_DIR})
 
+set(TEST_PYTHON_PATH "${PYLIB_BUILD_DIR}")
+if(MSVC)
+  set(TEST_PYTHON_PATH "${TEST_PYTHON_PATH}/${CMAKE_BUILD_TYPE}")
+endif()
+
+if(DEFINED ENV{PYTHONPATH})
+  set(TEST_PYTHON_PATH "${TEST_PYTHON_PATH}:$ENV{PYTHONPATH}")
+endif()
+
 add_test(NAME test_numpy
   COMMAND ${PYTHON_EXECUTABLE} test_numpy.py
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 set_tests_properties(test_numpy PROPERTIES
-  ENVIRONMENT PYTHONPATH=${PYLIB_BUILD_DIR}:$ENV{PYTHONPATH})
+  ENVIRONMENT PYTHONPATH=${TEST_PYTHON_PATH})