From b352bc79e3e4667e066743eee4b7ddc8bdcd7b9d Mon Sep 17 00:00:00 2001
From: Philippe Tillet <ptillet@g.harvard.edu>
Date: Tue, 23 Mar 2021 03:32:51 -0400
Subject: [PATCH] [CI] Changed triton-nightly to --pre triton (#78)

The solution proposed in #77 can create namespace conflicts when triton and triton-nightly have both been pip installed. Therefore, this PR is moving nightly releases to pre-releases in the main triton index.
---
 .ci/azure-pipelines.yml               | 2 +-
 .ci/build-wheels.yml                  | 2 +-
 docs/getting-started/installation.rst | 2 +-
 python/setup.py                       | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index d6891d460..fd56ee836 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -8,7 +8,7 @@ variables:
   value: venv
 
 # Run CI when something pushed to master
-# trigger: [ master ]
+trigger: none
 # Run CI when a PR is created or updated from master
 pr:
 - master
diff --git a/.ci/build-wheels.yml b/.ci/build-wheels.yml
index 71f79e06c..414a81fd7 100644
--- a/.ci/build-wheels.yml
+++ b/.ci/build-wheels.yml
@@ -17,7 +17,7 @@ jobs:
         pip3 install twine
       displayName: Install dependencies
     - bash: |
-        sed -i 's/name\=\"triton\"/name="triton-nightly"/g' python/setup.py
+        #sed -i 's/name\=\"triton\"/name="triton-nightly"/g' python/setup.py
         sed -i -r "s/version\=\"(.*)\"/version=\"\1-dev`date '+%Y%m%d'`\"/g" python/setup.py
         echo "" >> python/setup.cfg
         echo "[build_ext]" >> python/setup.cfg
diff --git a/docs/getting-started/installation.rst b/docs/getting-started/installation.rst
index fb56eca43..1a514fe9f 100644
--- a/docs/getting-started/installation.rst
+++ b/docs/getting-started/installation.rst
@@ -10,7 +10,7 @@ You can install the latest nightly release of Triton from pip:
 
 .. code-block:: bash
   
-      pip install triton-nightly
+      pip install -U --pre triton
 
 
 --------------
diff --git a/python/setup.py b/python/setup.py
index ef45a3a37..c3e818787 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -97,10 +97,7 @@ setup(
     long_description="",
     packages=["triton", "triton/_C", "triton/ops", "triton/ops/blocksparse"],
     install_requires=["numpy", "torch"],
-    package_data={
-        "triton/ops": ["*.c"],
-        "triton/ops/blocksparse": ["*.c"]
-    },
+    package_data={"triton/ops": ["*.c"], "triton/ops/blocksparse": ["*.c"]},
     include_package_data=True,
     ext_modules=[CMakeExtension("triton", "triton/_C/")],
     cmdclass={"build_ext": CMakeBuild},