Re-enable tests

plasticityai · Nov 3, 2018 · 44e59dc · 44e59dc
1 parent 47e395d
commit 44e59dc
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 77 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -35,81 +35,79 @@ Lint:
 Test Python 2:
   stage: Test
   script:
-    - echo pass
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/light/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.light.magnitude
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/medium/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.medium.magnitude
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/heavy/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.heavy.magnitude
-    # - apt-get install python-pip -y
-    # - pip2 install torch\>=0.4.1 # This is not in requirements.txt so must be installed like this
-    # - pip2 install -U pip setuptools
-    # - python2 setup.py install
-    # - pip install gensim
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o w2v.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s -a
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -s
-    # - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -a
-    # - ls
-    # - python2 -m tests.tests -i GoogleNews-vectors-negative300.light.magnitude -s GoogleNews-vectors-negative300.medium.magnitude -a GoogleNews-vectors-negative300.heavy.magnitude -- -v
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/light/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.light.magnitude
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/medium/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.medium.magnitude
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/heavy/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.heavy.magnitude
+    - apt-get install python-pip -y
+    - pip2 install torch\>=0.4.1 # This is not in requirements.txt so must be installed like this
+    - pip2 install -U pip setuptools
+    - python2 setup.py install
+    - pip install gensim
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/word2vec.bin -o w2v.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s -a
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -s
+    - python2 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -a
+    - ls
+    - python2 -m tests.tests -i GoogleNews-vectors-negative300.light.magnitude -s GoogleNews-vectors-negative300.medium.magnitude -a GoogleNews-vectors-negative300.heavy.magnitude -- -v
 
 Test Python 3:
   stage: Test
   script:
-    - echo pass
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/light/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.light.magnitude
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/medium/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.medium.magnitude
-    # - wget --quiet http://magnitude.plasticity.ai/word2vec/heavy/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.heavy.magnitude
-    # - pip3 install torch\>=0.4.1 # This is not in requirements.txt so must be installed like this
-    # - pip3 install -U pip wheel setuptools
-    # - python3 setup.py install
-    # - pip3 install gensim
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o w2v.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s -a
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -s
-    # - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -a
-    # - ls
-    # - python3 -m tests.tests -i GoogleNews-vectors-negative300.light.magnitude -s GoogleNews-vectors-negative300.medium.magnitude -a GoogleNews-vectors-negative300.heavy.magnitude -- -v
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/light/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.light.magnitude
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/medium/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.medium.magnitude
+    - wget --quiet http://magnitude.plasticity.ai/word2vec/heavy/GoogleNews-vectors-negative300.magnitude -O GoogleNews-vectors-negative300.heavy.magnitude
+    - pip3 install torch\>=0.4.1 # This is not in requirements.txt so must be installed like this
+    - pip3 install -U pip wheel setuptools
+    - python3 setup.py install
+    - pip3 install gensim
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.txt -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/glove.txt -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/fasttext.vec -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/zero.txt -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/large.txt -o out.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/word2vec.bin -o w2v.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -s -a
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -s
+    - python3 -m pymagnitude.converter -i tests/models/elmo_weights.hdf5 -o elmo.magnitude -v w2v.magnitude -a
+    - ls
+    - python3 -m tests.tests -i GoogleNews-vectors-negative300.light.magnitude -s GoogleNews-vectors-negative300.medium.magnitude -a GoogleNews-vectors-negative300.heavy.magnitude -- -v
 
 Deploy to PyPI:
   stage: Deploy to PyPI

diff --git a/setup.py b/setup.py
@@ -287,6 +287,7 @@ def build_req_wheels():
         '--wheel-dir=pymagnitude/req_wheels'
     ], cwd=PROJ_PATH).wait()
 
+    # Try torch from PyTorch website
     download_req_wheels = [
         ('http://download.pytorch.org/whl/cpu/', 'torch', '0.4.1'),
         ('http://download.pytorch.org/whl/cpu/', 'torch', '0.4.1.post2')
@@ -309,6 +310,16 @@ def build_req_wheels():
                 continue
             sys.stdout.flush()
 
+    # Try torch from PyPI
+    rc2 = subprocess.Popen([
+        sys.executable,
+        '-m',
+        'pip',
+        'wheel',
+        'torch',
+        '--wheel-dir=pymagnitude/req_wheels'
+    ], cwd=PROJ_PATH).wait()
+
     if rc:
         print("Failed to build requirements wheels!")
         pass
@@ -448,11 +459,13 @@ def has_ext_modules(foo):
             open(INSTALLED_FROM_WHEEL, 'w+').close()
 
     # Only create requirements if not installing from a wheel
-    # if not(installed_wheel()):
-    #     reqs = parse_requirements('requirements.txt')
-    # else:
-    #     reqs = []
-    reqs=[]
+    if any([a in sys.argv for a in ['bdist_wheel']]):
+        # The wheel shouldn't have any reqs
+        # since it gets packaged with all of its req wheels
+        reqs = []
+    else:
+        reqs = parse_requirements('requirements.txt')
+        reqs.append('torch')
 
     setup(
         name=PACKAGE_NAME,

diff --git a/version.py b/version.py
@@ -1,2 +1,2 @@
-__version_info__ = ('0', '1', '76')
+__version_info__ = ('0', '1', '77')
 __version__ = '.'.join(__version_info__)