Missing parameter

.coveragerc

@@ -3,3 +3,7 @@ omit =
     */python?.?/*
     */site-packages/nose/*
     */opentuner/opentuner/*
+    */test/*
+    */ctree/tools/*
+    */ctree/visual/*
+    */ctree/metrics/*

.gitignore

@@ -5,6 +5,7 @@
 
 # C extensions
 *.so
+*.o
 
 # Packages
 *.egg
@@ -37,6 +38,7 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+.idea
 
 # vim temp files
 .*.swp
@@ -52,7 +54,17 @@ htmlcov
 
 # virtualenv subdirs
 venv-*
+.venv
 
 # opentuner stuff
 opentuner.db
 opentuner.log
+
+# rope library
+.ropeproject
+
+# compiled files
+compiled/*
+
+*.sublime-project
+*.sublime-workspace

.travis.cfg

@@ -0,0 +1,28 @@
+[jit]
+COMPILE_PATH = ./compiled
+CACHE = False
+
+[c]
+CC = gcc
+CFLAGS = -fPIC -O2 -std=c99
+LDFLAGS =
+
+[omp]
+CC = gcc
+CFLAGS = -fPIC -std=c99 -O2 -I/opt/intel/composerxe/include -fopenmp
+LDFLAGS =
+
+[opencl]
+CC = gcc
+CFLAGS = -fPIC -std=c99 -O2
+# For Linux
+LDFLAGS = -L/home/travis/AMDAPPSDK/lib/x86_64 -lOpenCL
+
+[log]
+# maximum number of lines to show when programs are printed to the log
+max_lines_per_source = 10
+pygments_style = vim
+
+[opentuner]
+args = --quiet --no-dups
+timeout = 3

.travis.yml

@@ -1,90 +1,54 @@
+cache:
+  - apt
+  - pip
 language: python
-
 python:
-  - "2.7"
-  - "3.2"
-  - "3.3"
-
+  - '2.7'
+  - '3.4'
 env:
   global:
-    # encrypted OAuth token so Travis can commit docs back to Github
-    - secure: "QBB2KT4EFUdSkH9fjo5J/02zuZlD0FbVsKwYJgW6c4INp1UY/nx0nrsgjPSZQMD2HBztdfEZInugoVrOJwXBzWJ5Ioc19T9oYhnzaIF6oJRo1mTYDhragvdwiLfb0AyylGq7bgP4lgoMBtE1Oxauf0rKVEYiVeEhvHJup/di6A4="
-  matrix:
-    - LLVM_VERSION=3.3
-
+  - secure: QBB2KT4EFUdSkH9fjo5J/02zuZlD0FbVsKwYJgW6c4INp1UY/nx0nrsgjPSZQMD2HBztdfEZInugoVrOJwXBzWJ5Ioc19T9oYhnzaIF6oJRo1mTYDhragvdwiLfb0AyylGq7bgP4lgoMBtE1Oxauf0rKVEYiVeEhvHJup/di6A4=
 before_install:
-
   - sudo apt-get update -qq
-  - sudo apt-get install -qq llvm-$LLVM_VERSION
-
-
+  - if [ $TRAVIS_OS_NAME = "linux" ]; then
+      bash .travis/amd_sdk.sh;
+      tar -xjf AMD-SDK.tar.bz2;
+      AMDAPPSDK=${HOME}/AMDAPPSDK;
+      export OPENCL_VENDOR_PATH=${AMDAPPSDK}/etc/OpenCL/vendors;
+      mkdir -p ${OPENCL_VENDOR_PATH};
+      sh AMD-APP-SDK*.sh --tar -xf -C ${AMDAPPSDK};
+      echo libamdocl64.so > ${OPENCL_VENDOR_PATH}/amdocl64.icd;
+      export PYCL_OPENCL=${AMDAPPSDK}/lib/x86_64/libOpenCL.so;
+      export LD_LIBRARY_PATH=${AMDAPPSDK}/lib/x86_64:${LD_LIBRARY_PATH};
+      chmod +x ${AMDAPPSDK}/bin/x86_64/clinfo;
+      ${AMDAPPSDK}/bin/x86_64/clinfo;
+      find ${AMDAPPSDK} -name libOpenCL*;
+    fi;
+  - sudo apt-get install -qq opencl-headers
 install:
-  # make 'x.y' version string
   - export PYTHON_VERSION=$(python -c 'import sys; print(sys.version_info[0:2])')
-
-  # coverage and doc generator
-  - pip install numpy Sphinx coveralls coverage nose pygments
+  - pip install -r requirements.txt
+  - if [ $PY_MAJOR_MINOR \< "3.0" ]; then pip install opentuner; fi
+  - pip install coverage nose pycl
+  - cp .travis.cfg ctree/defaults.cfg
   - nosetests --version
   - coverage --version
-
-  # install llvmpy
-  - git clone git://github.com/llvmpy/llvmpy.git ${HOME}/llvmpy
-  - cd ${HOME}/llvmpy
-  - LLVM_CONFIG_PATH=/usr/bin/llvm-config-$LLVM_VERSION python setup.py install
-
-  # install opentuner
-  - git clone https://github.com/mbdriscoll/opentuner.git ${HOME}/opentuner
-  - cd ${HOME}/opentuner
-  - sudo apt-get install `cat debian-packages-deps | tr '\n' ' '`
-  - "if [[ \"x$PYTHON_VERSION\" -eq \"x(2.7)\" ]]; then pip install -r python-packages; fi"
-  - export PYTHONPATH=`pwd`:$PYTHONPATH
-
-  # install ctree via setup.py
-  - cd ${TRAVIS_BUILD_DIR}
   - python setup.py install
-
+  - env
 script:
-
-  # run test suite from home directory to verify installation
-  - cd ${HOME}
-  - nosetests --where=${TRAVIS_BUILD_DIR}/test
-
-  # run test suite again from build dir to get coverage info
   - cd ${TRAVIS_BUILD_DIR}
-  - nosetests --verbose --with-coverage --cover-package=ctree --cover-min-percentage=90 --cover-erase
-
-
+  - nosetests --verbose --with-coverage --cover-package=ctree --cover-min-percentage=87
+    --cover-erase
 after_success:
-
-  # return early if not building ucb-sejits/ctree
-  - "if [[ \"x${TRAVIS_REPO_SLUG}\" != 'xucb-sejits/ctree' ]]; then echo 'skipping coveralls/sphinx for non ucb-sejits/ctree builds.'; exit 0; fi"
-
-  # only build docs using Python 2.7
-  - "if [[ \"x$PYTHON_VERSION\" != \"x(2, 7)\" ]]; then echo 'Not Python 2.7; skipping doc build.'; exit 0; fi"
-
-  # publish coverage report
-  - coveralls
-
-  # build documentation
-  - make -C doc html
-
-  # merge documentation
-  - git clone "https://github.com/ucb-sejits/ctree-docs.git" ${HOME}/ctree-docs
-  - cd ${HOME}/ctree-docs
-  - git fetch origin gh-pages
-  - git checkout gh-pages
-  - rsync -a ${TRAVIS_BUILD_DIR}/doc/_build/html/ ./
-  - git add .
-  - git status
-
-  # commit documentation
-  - git config --global user.name 'Ctree Doc Bot'
-  - git config --global user.email 'mbdriscoll+ctreeoauth@gmail.com'
-  - git commit -m "Updating documentation from Travis Build ${TRAVIS_BUILD_ID}."
-
-  # set up oauth for push
-  - git config credential.helper "store --file=.git/credentials"
-  - echo "https://${GH_TOKEN}:x-oauth-basic@github.com" > .git/credentials
-
-  # commit new docs to ctree-docs
-  - git push origin gh-pages
+  - curl -X POST http://readthedocs.org/build/ctree
+notifications:
+  slack: ucb-sejits:cPZxBunxagWZ763mcsIXOV0W
+deploy:
+  provider: pypi
+  user: leonardt
+  password:
+    secure: SMiyQflUvfG0M8bR07Sri8VXnPSFKprNxA3RF7sljk99Aj9BuuuBRLkcOhkYtIRYfgHUSEnFeYYe+rb8y6BV/LnulCQiw9bCIqmPY9IYGy63DNjUGxh65MyO9HDjwz4hi+4endwZTXaUL3X4de9Xk3NnDhHISiLd7WymR9YQ7eE=
+  on:
+    tags: true
+    all_branches: true
+    repo: ucb-sejits/ctree

.travis/amd_sdk.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Original script from https://github.com/gregvw/amd_sdk/
+
+# Location from which get nonce and file name from
+URL="http://developer.amd.com/tools-and-sdks/opencl-zone/opencl-tools-sdks/amd-accelerated-parallel-processing-app-sdk/"
+URLDOWN="http://developer.amd.com/amd-license-agreement-appsdk/"
+
+NONCE1_STRING='name="amd_developer_central_downloads_page_nonce"'
+FILE_STRING='name="f"'
+POSTID_STRING='name="post_id"'
+NONCE2_STRING='name="amd_developer_central_nonce"'
+
+#For newest FORM=`wget -qO - $URL | sed -n '/download-2/,/64-bit/p'`
+FORM=`wget -qO - $URL | sed -n '/download-5/,/64-bit/p'`
+
+# Get nonce from form
+NONCE1=`echo $FORM | awk -F ${NONCE1_STRING} '{print $2}'`
+NONCE1=`echo $NONCE1 | awk -F'"' '{print $2}'`
+echo $NONCE1
+
+# get the postid
+POSTID=`echo $FORM | awk -F ${POSTID_STRING} '{print $2}'`
+POSTID=`echo $POSTID | awk -F'"' '{print $2}'`
+echo $POSTID
+
+# get file name
+FILE=`echo $FORM | awk -F ${FILE_STRING} '{print $2}'`
+FILE=`echo $FILE | awk -F'"' '{print $2}'`
+echo $FILE
+
+FORM=`wget -qO - $URLDOWN --post-data "amd_developer_central_downloads_page_nonce=${NONCE1}&f=${FILE}&post_id=${POSTID}"`
+
+NONCE2=`echo $FORM | awk -F ${NONCE2_STRING} '{print $2}'`
+NONCE2=`echo $NONCE2 | awk -F'"' '{print $2}'`
+echo $NONCE2
+
+wget --content-disposition --trust-server-names $URLDOWN --post-data "amd_developer_central_nonce=${NONCE2}&f=${FILE}" -O AMD-SDK.tar.bz2;

README.md

@@ -7,3 +7,18 @@ See the [website](http://ucb-sejits.github.io/ctree/) or [documentation](https:/
 
 [![Build Status](https://travis-ci.org/ucb-sejits/ctree.png?branch=master)](https://travis-ci.org/ucb-sejits/ctree)
 [![Coverage Status](https://coveralls.io/repos/ucb-sejits/ctree/badge.png)](https://coveralls.io/r/ucb-sejits/ctree)
+[![Documentation Status](https://readthedocs.org/projects/ctree/badge/?version=latest)](https://readthedocs.org/projects/ctree/?badge=latest)
+
+Quick Install
+-------------
+```shell
+pip install ctree
+```
+For OpenCL support, install the pycl package.
+```shell
+pip install pycl
+```
+
+Development
+-----------
+[See the wiki](https://github.com/ucb-sejits/ctree/wiki)

ctree/__init__.py

@@ -5,6 +5,8 @@
 """
 from __future__ import print_function
 
+
+
 # ---------------------------------------------------------------------------
 # explicit version check
 
@@ -54,11 +56,15 @@
 else:
     from io import StringIO as Memfile
 
+from ctree.util import highlight
+
 CONFIGFILE = Memfile()
 CONFIG.write(CONFIGFILE)
 CONFIG_TXT = CONFIGFILE.getvalue()
-LOG.info("using configuration:\n%s", CONFIG_TXT)
+LOG.info("using configuration:\n%s", highlight(CONFIG_TXT, language='ini'))
 CONFIGFILE.close()
+if CONFIG.has_option('log','level'):
+    logging.basicConfig(level=getattr(logging,CONFIG.get('log','level')))
 
 
 # ---------------------------------------------------------------------------
@@ -68,7 +74,7 @@
 import collections
 
 
-class Counter(object):
+class LogInfo(object):
     """Tracks events, reports counts upon garbage collections."""
 
     def __init__(self):
@@ -86,9 +92,44 @@ def report(self):
         LOG.info("execution statistics: (((\n%s)))", key_values_string)
 
 
-STATS = Counter()
+STATS = LogInfo()
 atexit.register(STATS.report)
 
+#----------------------------------------------------------------------------
+#Temporary directory stuff
+import tempfile
+import shutil
+import os.path
+
+if CONFIG.getboolean('jit', 'CACHE'):
+    STATS.log("recognized that caching is enabled")
+else:
+    STATS.log("recognized that caching is disabled")
+
+if not CONFIG.getboolean('jit', 'CACHE'):
+    compile_path_old = CONFIG.get('jit', 'COMPILE_PATH')
+    temporary_path = tempfile.mkdtemp()
+    CONFIG.set('jit', 'COMPILE_PATH', temporary_path)
+
+    def reset():
+        CONFIG.set('jit', 'COMPILE_PATH', compile_path_old)
+        if(os.path.isdir(temporary_path)):
+            shutil.rmtree(temporary_path)
+
+    atexit.register(reset)
+
+# Registries for type-based logic in extension packages.
+_TYPE_CODEGENERATORS = {}
+_TYPE_RECOGNIZERS = {}
+
+OCL_ENABLED = True
+try:
+    import pycl
+except ImportError:
+    OCL_ENABLED = False
+
+import ctree.np
+
 import ast
 import inspect
 import ctree.frontend
@@ -106,13 +147,15 @@ def ipython_show_ast(tree):
     converts tree in place to a dot format
     then renders that into a png file
     """
+    import ctree.dotgen
     return DotManager.dot_ast_to_image(tree)
 
 
-def browser_show_ast(tree, file_name):
+def browser_show_ast(tree, file_name=None):
     """
     convenience method to display an AST in ipython
     converts tree in place to a dot format
     then renders that into a png file
     """
-    return DotManager.dot_ast_to_browser(tree, file_name)
+    import ctree.dotgen
+    return DotManager.dot_ast_to_browser(tree, file_name)

ctree/analyses.py

@@ -45,23 +45,3 @@ def visit(self, node):
         if not isinstance(node, CtreeNode):
             raise AstValidationError("Expected a pure C ast, but found a non-CtreeNode: %s." % node)
         self.generic_visit(node)
-
-
-class VerifyParentPointers(NodeVisitor):
-    """
-    Checks that parent pointers are set correctly, and throws
-    an AstValidationError if they're not.
-    """
-
-    def _check(self, child, parent):
-        """throw if child.parent is not the actual parent"""
-        if child.parent != parent:
-            raise AstValidationError("Expect parent of %s to be %s, but got %s instead." %
-                                     (type(child), type(parent), type(child.parent)))
-
-    def generic_visit(self, node):
-        for _, value in ast.iter_fields(node):
-            for child in flatten(value):
-                if isinstance(child, ast.AST):
-                    self._check(child, node)
-                    self.visit(child)