Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4165aecf226
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b807e475abe
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 22, 2015

  1. conda: reformat.

    whitequark committed Oct 22, 2015
    Copy the full SHA
    7dea097 View commit details

  2. conda: include git hash in build string.

    whitequark committed Oct 22, 2015
    Copy the full SHA
    237959b View commit details

  3. conda: build noarch package without bitstreams.

    whitequark committed Oct 22, 2015
    Copy the full SHA
    7b807e4 View commit details
Showing with 67 additions and 130 deletions.
  1. +12 −15 .travis.yml
  2. +0 −60 conda/artiq/build.sh
  3. +55 −55 conda/artiq/meta.yaml
27 changes: 12 additions & 15 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -6,32 +6,29 @@ env:
global:
- secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws="
matrix:
- BUILD_SOC=0
- BUILD_SOC=1
before_install:
- BUILD_SOC=none
install:
- mkdir -p $HOME/.mlabs
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi
- if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi
- . ./.travis/get-toolchain.sh
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=none; fi
- if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; ./.travis/get-toolchain.sh; fi
- . ./.travis/get-anaconda.sh
- echo "BUILD_SOC=$BUILD_SOC" >> $HOME/.mlabs/build_settings.sh
- source $HOME/miniconda/bin/activate py35
- conda install -q pip coverage anaconda-client migen cython
- conda install -q pip coverage anaconda-client migen=0.0 cython
- pip install coveralls
install:
# workaround for https://github.com/conda/conda-build/issues/466
- mkdir -p /home/travis/miniconda/conda-bld/linux-64
- conda index /home/travis/miniconda/conda-bld/linux-64
- conda build --python 3.5 conda/artiq
- conda install -q artiq --use-local
script:
- coverage run --source=artiq setup.py test
- make -C doc/manual html
- conda build --python 3.5 conda/artiq
- conda install -q $(conda build --output --python 3.5 conda/artiq)
- [ $BUILD_SOC == none ] && PACKAGES="$(conda build --output --python 3.5 conda/artiq) $PACKAGES"
- [ $BUILD_SOC == none ] && coverage run --source=artiq setup.py test
- [ $BUILD_SOC == none ] && make -C doc/manual html
after_success:
- |
if [ "$TRAVIS_BRANCH" == "master" -a $BUILD_SOC -eq 1 ]; then
if [ "$TRAVIS_BRANCH" == "master" -a "$PACKAGES" != "" ]; then
anaconda -q login --hostname $(hostname) --username $binstar_login --password $binstar_password
anaconda -q upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
anaconda -q upload --user $binstar_login --channel dev $PACKAGES
anaconda -q logout
fi
- coveralls
60 changes: 0 additions & 60 deletions conda/artiq/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,4 @@
#!/bin/bash

BUILD_SETTINGS_FILE=$HOME/.mlabs/build_settings.sh

if [ -f $BUILD_SETTINGS_FILE ]
then
source $BUILD_SETTINGS_FILE
fi

$PYTHON setup.py install --single-version-externally-managed --record=record.txt
git clone --recursive https://github.com/m-labs/misoc
export MSCDIR=$SRC_DIR/misoc

ARTIQ_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq
BIN_PREFIX=$ARTIQ_PREFIX/binaries/
mkdir -p $ARTIQ_PREFIX/misc
mkdir -p $BIN_PREFIX/kc705 $BIN_PREFIX/pipistrello

# build for KC705 NIST_QC1

cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 build-headers build-bios; cd -
make -C soc/runtime clean runtime.fbi
[ "$BUILD_SOC" != "0" ] && (cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 $MISOC_EXTRA_VIVADO_CMDLINE build-bitstream)

# install KC705 NIST_QC1 binaries

mkdir -p $BIN_PREFIX/kc705/nist_qc1
cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/nist_qc1/
cp $SRC_DIR/misoc/software/bios/bios.bin $BIN_PREFIX/kc705/
[ "$BUILD_SOC" != "0" ] && cp $SRC_DIR/misoc/build/artiq_kc705-nist_qc1-kc705.bit $BIN_PREFIX/kc705/
wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit
mv bscan_spi_kc705.bit $BIN_PREFIX/kc705/

# build for Pipistrello

cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_pipistrello build-headers build-bios; cd -
make -C soc/runtime clean runtime.fbi
[ "$BUILD_SOC" != "0" ] && (cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_pipistrello $MISOC_EXTRA_ISE_CMDLINE build-bitstream)

# install Pipistrello binaries

cp soc/runtime/runtime.fbi $BIN_PREFIX/pipistrello/
cp $SRC_DIR/misoc/software/bios/bios.bin $BIN_PREFIX/pipistrello/
[ "$BUILD_SOC" != "0" ] && cp $SRC_DIR/misoc/build/artiq_pipistrello-nist_qc1-pipistrello.bit $BIN_PREFIX/pipistrello/
wget https://people.phys.ethz.ch/~robertjo/bscan_spi_lx45_csg324.bit
mv bscan_spi_lx45_csg324.bit $BIN_PREFIX/pipistrello/

# build for KC705 NIST_QC2

cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 -s NIST_QC2 build-headers; cd -
make -C soc/runtime clean runtime.fbi
[ "$BUILD_SOC" != "0" ] && (cd $SRC_DIR/misoc; $PYTHON make.py -X ../soc -t artiq_kc705 -s NIST_QC2 $MISOC_EXTRA_VIVADO_CMDLINE build-bitstream)

# install KC705 NIST_QC2 binaries

mkdir -p $BIN_PREFIX/kc705/nist_qc2
cp soc/runtime/runtime.fbi $BIN_PREFIX/kc705/nist_qc2/
[ "$BUILD_SOC" != "0" ] && cp $SRC_DIR/misoc/build/artiq_kc705-nist_qc2-kc705.bit $BIN_PREFIX/kc705/

cp artiq/frontend/artiq_flash.sh $PREFIX/bin

# misc
cp misc/99-papilio.rules $ARTIQ_PREFIX/misc/
cp misc/99-kc705.rules $ARTIQ_PREFIX/misc/
110 changes: 55 additions & 55 deletions conda/artiq/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
package:
name: artiq
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
name: artiq
version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}

source:
git_url: https://github.com/m-labs/artiq
git_tag: master
git_url: https://github.com/m-labs/artiq
git_tag: master

build:
noarch_python: True
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
entry_points:
- artiq_client = artiq.frontend.artiq_client:main
- artiq_compile = artiq.frontend.artiq_compile:main
- artiq_coretool = artiq.frontend.artiq_coretool:main
- artiq_ctlmgr = artiq.frontend.artiq_ctlmgr:main
- artiq_gui = artiq.frontend.artiq_gui:main
- artiq_influxdb = artiq.frontend.artiq_influxdb:main
- artiq_master = artiq.frontend.artiq_master:main
- artiq_mkfs = artiq.frontend.artiq_mkfs:main
- artiq_rpctool = artiq.frontend.artiq_rpctool:main
- artiq_run = artiq.frontend.artiq_run:main
- lda_controller = artiq.frontend.lda_controller:main
- novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main
- pxi6733_controller = artiq.frontend.pxi6733_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
entry_points:
- artiq_client = artiq.frontend.artiq_client:main
- artiq_compile = artiq.frontend.artiq_compile:main
- artiq_coretool = artiq.frontend.artiq_coretool:main
- artiq_ctlmgr = artiq.frontend.artiq_ctlmgr:main
- artiq_gui = artiq.frontend.artiq_gui:main
- artiq_influxdb = artiq.frontend.artiq_influxdb:main
- artiq_master = artiq.frontend.artiq_master:main
- artiq_mkfs = artiq.frontend.artiq_mkfs:main
- artiq_rpctool = artiq.frontend.artiq_rpctool:main
- artiq_run = artiq.frontend.artiq_run:main
- lda_controller = artiq.frontend.lda_controller:main
- novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main
- pxi6733_controller = artiq.frontend.pxi6733_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main

requirements:
build:
- python >=3.5.0
- setuptools
- numpy
- migen 0.0
- pyelftools
- binutils-or1k-linux
run:
- python >=3.5.0
- llvmlite-artiq
- scipy
- numpy
- prettytable
- pyserial
- sphinx
- sphinx-argparse
- h5py
- dateutil
- pydaqmx
- pyelftools
- quamash
- pyqtgraph
- flterm # [linux]
- pygit2
- aiohttp
- binutils-or1k-linux
build:
- python >=3.5.0
- setuptools
- numpy
- migen 0.0
- pyelftools
- binutils-or1k-linux
run:
- python >=3.5.0
- llvmlite-artiq
- scipy
- numpy
- prettytable
- pyserial
- sphinx
- sphinx-argparse
- h5py
- dateutil
- pydaqmx
- pyelftools
- quamash
- pyqtgraph
- flterm # [linux]
- pygit2
- aiohttp
- binutils-or1k-linux

test:
imports:
- artiq

imports:
- artiq

about:
home: http://m-labs.hk/artiq
license: 3-clause BSD
summary: 'ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is being developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping.'
home: http://m-labs.hk/artiq
license: 3-clause BSD
summary: 'ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a next-generation control system for quantum information experiments. It is being developed in partnership with the Ion Storage Group at NIST, and its applicability reaches beyond ion trapping.'