Skip to content

Commit

Permalink
Last batch of renaming. This should get everything that was missing.
Browse files Browse the repository at this point in the history
  • Loading branch information
abergeron committed Apr 23, 2014
1 parent 430309f commit f16e0a1
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

The instances that have a different copyright or license are:

src/compyte_strl.c (MIT, but different copyright)
src/gpuarray_strl.c (MIT, but different copyright)
6 changes: 3 additions & 3 deletions doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.

PROJECT_NAME = "libcompyte"
PROJECT_NAME = "libgpuarray"

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
Expand Down Expand Up @@ -700,7 +700,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = ../src/compyte/wincompat ../src/compyte/compat.h
EXCLUDE = ../src/gpuarray/wincompat ../src/gpuarray/compat.h

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down Expand Up @@ -1586,7 +1586,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.

PREDEFINED = "COMPYTE_PUBLIC=" "COMPYTE_LOCAL=/** \private */"
PREDEFINED = "GPUARRAY_PUBLIC=" "GPUARRAY_LOCAL=/** \private */"

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Expand Down
8 changes: 4 additions & 4 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@ qthelp: doxy
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/compyte.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/gpuarray.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/compyte.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/gpuarray.qhc"

devhelp: doxy
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/compyte"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/compyte"
@echo "# mkdir -p $$HOME/.local/share/devhelp/gpuarray"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/gpuarray"
@echo "# devhelp"

epub: doxy
Expand Down
2 changes: 1 addition & 1 deletion doc/c_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ C library reference
===================

.. doxygenindex::
:project: compyte
:project: gpuarray
20 changes: 10 additions & 10 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# -*- Coding: utf-8 -*-
#
# compyte documentation build configuration file, created by
# gpuarray documentation build configuration file, created by
# sphinx-quickstart on Wed Nov 21 16:23:37 2012.
#
# This file is execfile()d with the current directory set to its containing dir.
Expand Down Expand Up @@ -41,7 +41,7 @@
master_doc = 'index'

# General information about the project.
project = u'compyte'
project = u'gpuarray'
copyright = u'2012, Arnaud Bergeron'

# The version info for the project you're documenting, acts as replacement for
Expand Down Expand Up @@ -165,7 +165,7 @@
#html_file_suffix = None

# Output file base name for HTML help builder.
htmlhelp_basename = 'compytedoc'
htmlhelp_basename = 'gpuarraydoc'


# -- Options for LaTeX output --------------------------------------------------
Expand All @@ -184,7 +184,7 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'compyte.tex', u'Compyte Documentation',
('index', 'gpuarray.tex', u'libgpuarray Documentation',
u'Arnaud Bergeron', 'manual'),
]

Expand Down Expand Up @@ -214,7 +214,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'compyte', u'compyte Documentation',
('index', 'gpuarray', u'libgpuarray Documentation',
[u'Arnaud Bergeron'], 1)
]

Expand All @@ -228,8 +228,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'compyte', u'compyte Documentation',
u'Arnaud Bergeron', 'compyte', 'One line description of project.',
('index', 'gpuarray', u'libgpuarray Documentation',
u'Arnaud Bergeron', 'gpuarray', 'One line description of project.',
'Miscellaneous'),
]

Expand All @@ -243,9 +243,9 @@
#texinfo_show_urls = 'footnote'

breathe_projects = {
"compyte": "_doxybuild/xml/",
"gpuarray": "_doxybuild/xml/",
}
breathe_default_project = "compyte"
breathe_default_project = "gpuarray"

breathe_domain_by_extension = {
"h": "c",
Expand Down
6 changes: 3 additions & 3 deletions doc/index.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.. compyte documentation master file, created by
.. libgpuarray documentation master file, created by
sphinx-quickstart on Wed Nov 21 16:23:37 2012.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to compyte's documentation!
===================================
Welcome to libgpuarray's documentation!
=======================================

Contents:

Expand Down
16 changes: 8 additions & 8 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ The code is currently in a github repo branch. It will be moved. To
get it:
::

git clone https://github.com/abergeron/compyte.git
cd compyte
git clone https://github.com/abergeron/libgpuarray.git
cd gpuarray
git checkout reorg

Step-by-step install
--------------------

extract/clone the source to <dir>

For libcompyte:
For libgpuarray:
::

cd <dir>
Expand All @@ -62,11 +62,11 @@ For libcompyte:
For pygpu:
::

# This must be done after libcompyte is installed as per instructions above.
# This must be done after libgpuarray is installed as per instructions above.
python setup.py build
python setup.py install

If you installed libcompyte in a path that isn't a default one, you
If you installed libgpuarray in a path that isn't a default one, you
will need to specify where it is. Replace the first line by something
like this:
::
Expand Down Expand Up @@ -160,16 +160,16 @@ If you get an error message similar to this one:
::

Running tests...
Test project /Users/anakha/ext/compyte/Debug
Test project /Users/anakha/ext/gpuarray/Debug
No tests were found!!!

This means either you don't have check installed or it wasn't found by
the cmake detection script.

To run the python tests run nosetests in the pygpu subdirectory. By
default it will attempt to use 'opencl0:0' as the compute device but
you can override this by setting the DEVICE or COMPYTE_DEVICE
environement variable, with COMPYTE_DEVICE having priority, if set.
you can override this by setting the DEVICE or GPUARRAY_DEVICE
environement variable, with GPUARRAY_DEVICE having priority, if set.
The format for the device string is '<backend name><device id>'.
Possible backend names are 'cuda' and 'opencl'.

Expand Down
4 changes: 2 additions & 2 deletions doc/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ if "%1" == "qthelp" (
echo.
echo.Build finished; now you can run "qcollectiongenerator" with the ^
.qhcp project file in %BUILDDIR%/qthelp, like this:
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\compyte.qhcp
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\gpuarray.qhcp
echo.To view the help file:
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\compyte.ghc
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\gpuarray.ghc
goto end
)

Expand Down
6 changes: 3 additions & 3 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ set(LIBS ${LIBS} ${CHECK_LIBRARIES})
include_directories(. ../src)

add_executable(check_types main.c check_types.c)
target_link_libraries(check_types ${LIBS} compyte)
target_link_libraries(check_types ${LIBS} gpuarray)
add_test(test_types ${CMAKE_CURRENT_BINARY_DIR}/check_types)

add_executable(check_error main.c check_error.c)
target_link_libraries(check_error ${LIBS} compyte)
target_link_libraries(check_error ${LIBS} gpuarray)
add_test(test_error ${CMAKE_CURRENT_BINARY_DIR}/check_error)

add_executable(check_buffer main.c check_buffer.c)
target_link_libraries(check_buffer ${LIBS} compyte)
target_link_libraries(check_buffer ${LIBS} gpuarray)
add_test(test_buffer ${CMAKE_CURRENT_BINARY_DIR}/check_buffer)

ELSE(CHECK_FOUND)
Expand Down

0 comments on commit f16e0a1

Please sign in to comment.