wheels for windows

.travis.yml

@@ -1,52 +1,42 @@
+language: sh
+script: ./build.sh
+os: 
+    - linux
+    - windows
+    - osx
 env:
-  global:
-    - REPO_DIR=.
-    - BUILD_COMMIT=$TRAVIS_COMMIT
-    - PLAT=x86_64
-
-install: 
-  - git clone https://github.com/matthew-brett/multibuild && cd multibuild && git checkout 254ad28 && cd ..
-  - . multibuild/common_utils.sh
-  - . multibuild/travis_steps.sh
-  - before_install 
-  - build_wheel $REPO_DIR $PLAT
-script: 
-  - install_run $PLAT
-
-after_success:
-  - ./deploy.sh
-
-
+    - PY_VER=3.6
+    - PY_VER=3.7
+    - PY_VER=3.5
+osx_image: xcode8.3
 matrix:
-  include:
+    exclude:
+        os: windows
+        env: PY_VER=3.5
+deploy:
+  provider: s3
+  access_key_id: AKIAIR7X3BP26ZWUNFPA
+  skip_cleanup: true
+  secret_access_key:
+    secure: wUNE0AxIZ3rQVO6pUXQyfOVI4UN/4bgTb+y8566pFYQ68mzZEW3XNl96n8HtkHGYuJGnNGWGbGKcp2a1MCoiyePR+NnmoUxCledUffU+s88Sxg9Qj7DW8JOLImocNXG+8y2OeC+QjmrkB109inM0c2T+ESeLZi9yALaLSxVEKToXB1EBDtOohjelNcA8xoP9yb4H6yoT01XLNkno2o9fmKc+ZXtLi9xZVpMX1aH0Hs2pchm0WmE7d93XVD0K9ZM/2q1yT8ojJngKAbpJeJQSSSJStNpFBIp7hc+2slFP9/QOCPJQZQuIjJkHj2iXEMgIrerbFgl/n5konQiZFHwDZbmubQR8cfVOmr/+By8n9h13rzL7OpqCx84f4QuaRifRY6vMnu0nqbo7M7vkW0fEzcMOEpn1fcL0ulOOFc9Oedyvn08flK2M3DX10rglncK+MkGdWjH23K/1PLNOCIdNO8kWO+yvuCbdx1oJzMcpr5w52Sh+pWt4xXk1TQvXtzPVxLxf+mGumHvU1wSFW2IbBcLIv3C/BeqeNbyRNIrXT2rfaOzDj8LEXOq3IIdfgKmHx2a4Iz3V3S2a5vJiXeBtr9G4LtH/k9eRRyr6CKN+HqSZSRnwL0W8i3u7QvcP6wSF91lJCpAJpsuu5faE3RKfW/hUd/gsmo1f1tcJZEaCkzo=
+  bucket: games-wheels
+  local-dir: wheelhouse
+  upload-dir: atari-py/$TRAVIS_TAG
+  acl: public_read
+  on:
+    repo: openai/atari-py
+    tags: true
 
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-
-
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DEPLOY_SDIST=true
-
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.6
-
-    - os: osx
-      osx_image: xcode8.3
-      env:
-        - MB_PYTHON_VERSION=3.7
-
-
+jobs:
+  # this extra stage is due to Travis bug that prevets deploying to pypi from windows or usage of 
+  # secret env variables on windows. Instead of doing either, we are deploying to s3 first, and
+  # then using a separate stage to download files from s3 and deploy them to pypi. 
+  include:
+   - stage: "Deploy to PyPI"
+     script: ./deploy_to_pypi.sh
+     env:
+        - TWINE_USERNAME=peterz-openai
+        - AWS_ACCESS_KEY_ID=AKIAIR7X3BP26ZWUNFPA
+        - AWS_DEFAULT_REGION=us-west-2
+        - secure: "i0qbR3wG2OvJWVBKnAVkgtNIPPxoNQz8KBn+c9RBAWZw0XDsjkUwsDZMTXzll1Do24xLb9FVti2iq7GsNvHcCzltSGOLv6UDm2ywJc4Bz/Fyho27A0kYGe6W/FwtEt+VTkx4z0+7tNOb4KVhs26OmIGdKMJwNibnU86rRtzf05Iq7xS+8Mi/9j09oC9ZXACzOFTmbQe98Gq93ROo+7wfpCVJip9QigJTSZhE7axBEtpXlZ5//T2Eo2bxbJs5f9tNiMrLRy8NMYq1B/he9HevpxlqE15+wJs9exaDClWLtsb7trFKSnmrqtUeXI3aUIQwLgQfaYJlvvmSBUtJxxyk5QHLn3+0u6TCA9ZbHaEElXSLrcexjSEp37+HXH0Z69JzTYn0pVX4IvrmuLhgg4X3z7Ys3SyIe8Tq39QubQ8TWM8bzBN5H0VYObY35BmLl68k2AF61Rq0obJS48ekguzf88DwI9UzxYm8LnlsgpyeX1iLJ6Sy9xdP3S/5onP1+bzaDZ7JNMabNmJ22ZjqPyBp+mUyBjfab9ouDS07CNAPmyQV6VWSL8EaD9QawWB0khgKoen+NNFGeivEIgCRanP9Rg7mpw7Px9elwbl2hXGco7EGdZFPV89uHWEhL2nHUmxVjaRUNlSXjDrwI6f8vlMfbHU5PskxlrG047F/is3gQ00="
+        - secure: "NZRMo04bBX2X7phT29rQKDklPFVbnqMoUAhrVFjTLxvAqsQdericyalMjXsE79IA02uZEsHfS45P9YXzgHC4uCZI6694kOZfhmBtQ0FxeJ5M3Zx6IRyMhf92rk7F/DRcRBe78JIBkgTXDJCyQoEX1/RIYIz723BSzRGosOJa1xUub8MQ7Rl3TF54j9JAshBNBTpIw1tORWo3K1A8FucQNgI3N7DucWhg+C3D7cxZok5xwz7FoXHt+Xv7wFvCETaNIsmu/3EI15K9Y43XXQ2rBc46g41SDX7f1rwVNl0D8kStjyDdhdQODDdKPMe3dl6Lckz0qMTaoTUnWL91L+qBAFHsC2imWJVNGL+/4iyTRQAsq/hl7GYNcesfm7kCXNcCjSeyx3ZkOOgZ0okFKWZK51RuKjlCcKgDOMSInCW8vR2rRK699wAfePr38t5TO5E2uQ+hF52NMbzDKw9C6azX4UaWuKPio8oxseOWfLKSYZTCVirBikLM8m4LABCZyKiMlTR1SdzxQmrLAxgnWaD+QYY4SoN4fButDjONOARFKF5e3njzVQo2nHmXb1EATOmnQ4pjKcJezSccIcmYeWpPskXWSmJbWi81zwHz/AyqH6fEnAWmVj0RKjrBfyCZCtEGBikQ9KTJuVHupwNT17CyZKUxtxBpYOpFnk+mLLom3Ak="

atari_py/ale_interface/CMakeLists.txt

@@ -10,7 +10,7 @@ option(BUILD_CPP_LIB "Build C++ Shared Library" OFF)
 option(BUILD_CLI "Build ALE Command Line Interface" OFF)
 option(BUILD_C_LIB "Build ALE C Library (needed for Python interface)" ON)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused -fPIC -O3 -fomit-frame-pointer -D__STDC_CONSTANT_MACROS")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -fomit-frame-pointer -D__STDC_CONSTANT_MACROS")
 add_definitions(-DHAVE_INTTYPES)
 set(LINK_LIBS z)
 
@@ -55,7 +55,8 @@ if(APPLE)
   set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
 endif()
 
-if(WINDOWS OR MINGW)
+if(WIN32 OR MINGW)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
   list(APPEND SOURCES ${SOURCE_DIR}/os_dependent/SettingsWin32.cxx ${SOURCE_DIR}/os_dependent/OSystemWin32.cxx ${SOURCE_DIR}/os_dependent/FSNodeWin32.cxx)
 else()
   list(APPEND SOURCES ${SOURCE_DIR}/os_dependent/SettingsUNIX.cxx ${SOURCE_DIR}/os_dependent/OSystemUNIX.cxx ${SOURCE_DIR}/os_dependent/FSNodePOSIX.cxx)
@@ -112,6 +113,7 @@ endif(UNIX)
 
 include_directories(
   ${SOURCE_DIR}
+  ${SOURCE_DIR}/zlib
   ${SOURCE_DIR}/common
   ${SOURCE_DIR}/controllers
   ${SOURCE_DIR}/emucore

atari_py/ale_interface/src/games/RomSettings.hpp

@@ -33,6 +33,7 @@
 #ifndef __ROMSETTINGS_HPP__
 #define __ROMSETTINGS_HPP__
 
+#include <algorithm>
 #include "../common/Constants.h"
 #include "../emucore/Serializer.hxx"
 #include "../emucore/Deserializer.hxx"

atari_py/ale_interface/src/games/Roms.hpp

@@ -13,6 +13,7 @@
 #define __ROMS_HPP__
 
 #include <string>
+#include <algorithm>
 
 struct RomSettings;
 

atari_py/ale_python_interface.py

@@ -10,8 +10,12 @@
 import os
 import six
 
-ale_lib = cdll.LoadLibrary(os.path.join(os.path.dirname(__file__),
-                                        'ale_interface/build/libale_c.so'))
+if os.name == 'posix':
+    ale_lib = cdll.LoadLibrary(os.path.join(os.path.dirname(__file__),
+                                            'ale_interface/build/libale_c.so'))
+else:
+    ale_lib = cdll.LoadLibrary(os.path.join(os.path.dirname(__file__),
+                                            'ale_interface/build/ale_c.dll'))
 
 ale_lib.ALE_new.argtypes = None
 ale_lib.ALE_new.restype = c_void_p

atari_py/package_data.txt

@@ -1,4 +1,5 @@
-ale_interface/build/*.so
+ale_interface/build/libale_c.so
+ale_interface/build/ale_c.dll
 ale_interface/build/ale
 ale_c_wrapper.cpp
 ale_c_wrapper.h
@@ -396,3 +397,4 @@ atari_roms/wizard_of_wor.bin
 atari_roms/yars_revenge.bin
 atari_roms/zaxxon.bin
 package_data.txt
+tests/*.py

atari_py/tests/test_smoke.py

@@ -14,3 +14,8 @@ def test_smoke():
     (screen_width,screen_height) = ale.getScreenDims()
     arr = np.zeros((screen_height, screen_width, 4), dtype=np.uint8)
     ale.getScreenRGB(arr)
+
+if __name__ == '__main__':
+    print('smoke test')
+    test_smoke()
+    print('done!')

build.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ex
+
+if [ $(uname) == 'Linux' ] || [ $(uname) == 'Darwin' ]; then
+    ./multibuild.sh
+else
+    ./win_build.sh
+fi

config.sh

@@ -3,13 +3,12 @@ function pre_build {
     set -ex
     build_zlib
     pip install cmake
-    pip install .
-    pip install pytest
-    pytest .
 }
 
 function run_tests {
     pip install gym[atari]
     python -c "import gym; gym.make('Pong-v4')"
+    pip install pytest
+    pytest --pyargs atari_py.tests
 }
 

deploy.sh

@@ -1,11 +1,11 @@
 set -ex
 if [[ ! -z "$TRAVIS_TAG" ]]; then
     pip install twine
-    twine upload wheelhouse/*
+   twine upload --verbose wheelhouse/atari_py*
 
     if [[ ! -z "$DEPLOY_SDIST" ]]; then
         python setup.py sdist
-        twine upload dist/*       
+        twine upload dist/*
     fi
 fi
 

deploy_to_pypi.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -ex
+
+# TRAVIS_TAG=0.1.14
+
+if [[ -z "$TRAVIS_TAG" ]]; then
+    echo "Not a tagged commit, quitting"
+    exit 0
+fi
+
+pip install virtualenv --user
+python -m virtualenv --python=python3 .venv
+source .venv/bin/activate
+
+pip install awscli twine
+mkdir -p wheelhouse
+env
+# ugh something in awscli does not work on travis we'll download objects via curl
+# aws s3 cp --recursive s3://games-wheels/atari-py/${TRAVIS_TAG} wheelhouse/
+SUFFIXES="-manylinux1_x86_64.whl -win_amd64.whl -macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl"
+# SUFFIXES="-manylinux1_x86_64.whl"
+PY_VERS="-cp36-cp36m -cp37-cp37m"
+URLPREFIX="https://s3-us-west-2.amazonaws.com/games-wheels/atari-py/${TRAVIS_TAG}/atari_py-${TRAVIS_TAG}"
+
+cd wheelhouse
+for s in $SUFFIXES; do
+  for p in $PY_VERS; do
+    curl -O ${URLPREFIX}${p}${s}
+  done;
+done
+
+twine upload --verbose atari_py*

installzlib.bat

@@ -0,0 +1,12 @@
+curl -O https://zlib.net/zlib1211.zip
+unzip zlib1211.zip 
+cp -r zlib-1.2.11 atari_py/ale_interface/src/zlib
+cd atari_py/ale_interface/src/zlib
+cmake -DCMAKE_GENERATOR_PLATFORM=x64 . 
+cmake --build .
+
+cd ../..
+mkdir -p build
+cp src/zlib/Debug/zlibstaticd.lib build/z.lib
+
+

multibuild.sh

@@ -0,0 +1,13 @@
+set -ex
+export REPO_DIR=.
+export BUILD_COMMIT=$TRAVIS_COMMIT
+export PLAT=x86_64
+export MB_PYTHON_VERSION=$PY_VER
+
+git clone https://github.com/matthew-brett/multibuild && cd multibuild && git checkout 254ad28 && cd ..
+source multibuild/common_utils.sh
+source multibuild/travis_steps.sh
+before_install
+build_wheel $REPO_DIR $PLAT
+install_run $PLAT
+

setup.py

@@ -5,16 +5,21 @@
 import subprocess
 import sys
 
-with open(os.path.join(os.path.dirname(__file__), 'atari_py/package_data.txt')) as f:
+with open(os.path.join(os.path.dirname(__file__), 'atari_py', 'package_data.txt')) as f:
     package_data = [line.rstrip() for line in f.readlines()]
 
 
 class Build(build_ext):
     def run(self):
+        if os.name != 'posix' and not self.inplace:
+            # silly patch to disable build steps on windows, as we are doing compilation externally
+            return
         cores_to_use = max(1, multiprocessing.cpu_count() - 1)
-        cmd = ['make', 'build', '-C', 'atari_py/ale_interface', '-j', str(cores_to_use)]
         try:
-            subprocess.check_call(cmd, cwd=None if self.inplace else self.build_lib)
+            cwd = os.path.join('' if self.inplace else self.build_lib, 'atari_py', 'ale_interface', 'build')
+            os.makedirs(cwd, exist_ok=True)
+            subprocess.check_call(['cmake', '..'], cwd=cwd)
+            subprocess.check_call(['cmake', '--build', '.'], cwd=cwd)
         except subprocess.CalledProcessError as e:
             sys.stderr.write("Could not build atari-py: %s. (HINT: are you sure cmake is installed? You might also be missing a library. Atari-py requires: zlib [installable as 'apt-get install zlib1g-dev' on Ubuntu].)\n" % e)
             raise
@@ -28,14 +33,15 @@ def __init__(self, name, sourcedir=''):
         self.sourcedir = os.path.abspath(sourcedir)
 
 setup(name='atari-py',
-      version='0.1.7',
+      version='0.1.15',
       description='Python bindings to Atari games',
       url='https://github.com/openai/atari-py',
       author='OpenAI',
       author_email='info@openai.com',
       license='',
       packages=['atari_py'],
       package_data={'atari_py': package_data},
+      include_package_data=True,
       ext_modules=[CMakeExtension('atari_py')],
       cmdclass={'build_ext': Build},
       install_requires=['numpy', 'six'],

win_build.sh

@@ -0,0 +1,20 @@
+set -ex
+choco install --yes python3 --version $PY_VER
+export PYROOT=/c/Python${PY_VER//./}
+export PATH=$PYROOT:$PYROOT/Scripts:$PATH
+pip install cmake pytest
+./installzlib.bat
+mkdir -p atari_py/ale_interface/build
+
+cd atari_py/ale_interface/build
+cmake -DCMAKE_GENERATOR_PLATFORM=x64 ..
+cmake --build .
+cp Debug/ale_c.dll .
+cd ../../../
+
+pip install wheel && pip wheel . -w wheelhouse --no-deps -vvv
+ls wheelhouse/atari_py* 
+rm -rf atari_py*
+pip install $(ls wheelhouse/atari_py*)
+pytest --pyargs atari_py.tests
+