Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to universal-ctags #250

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
build-essential \
ca-certificates \
curl \
exuberant-ctags \
universal-ctags \
gfortran \
git \
libhwloc-dev \
Expand All @@ -48,11 +48,11 @@ jobs:
run: |
brew install \
curl \
ctags-exuberant \
gawk \
gnu-sed \
hwloc \
pkg-config
pkg-config \
universal-ctags
- uses: actions/[email protected]
with:
python-version: ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion BifrostDemo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"# @title Install C++ deps\n",
"%%shell\n",
"\n",
"sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential"
"sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential"
]
},
{
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ in the docs to see which versions of the CUDA toolkit have been confirmed to wor

If using Ubuntu or another Debian-based linux distribution:

$ sudo apt-get install exuberant-ctags
$ sudo apt-get install universal-ctags

If using Redhat or another Redhat-based linux distribution:

$ sudo dnf install ctags

Otherwise check https://ctags.sourceforge.net/ for install instructions.

Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -17662,12 +17662,12 @@ then :
as_fn_error $? "Required program ctags was not found" "$LINENO" 5
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${CTAGS} is exuberant" >&5
printf %s "checking whether ${CTAGS} is exuberant... " >&6; }
printf %s "checking whether ${CTAGS} is sufficiently exuberant... " >&6; }
if ! ${CTAGS} --version | grep -q Exuberant
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
as_fn_error $? "exuberant ctags is required, but ${CTAGS} is a different version" "$LINENO" 5
as_fn_error $? "exuberant/universal ctags is required, but ${CTAGS} is a different version" "$LINENO" 5
else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ AX_WITH_PROG(CTAGS, ctags)
AS_IF([test x${CTAGS} = x],
[AC_MSG_ERROR([Required program ctags was not found])],
[])
AC_MSG_CHECKING([whether ${CTAGS} is exuberant])
AC_MSG_CHECKING([whether ${CTAGS} is sufficiently exuberant])
AS_IF([! ${CTAGS} --version | grep -q Exuberant],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([exuberant ctags is required, but ${CTAGS} is a different version])],
AC_MSG_ERROR([exuberant/universal ctags is required, but ${CTAGS} is a different version])],
[AC_MSG_RESULT([yes])])

AC_SUBST(SO_EXT, $shrext_cmds)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/Getting-started-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ has been tested against.
Other Dependencies
^^^^^^^^^^^^^^^^^^

- exuberant-ctags
- universal-ctags
- Basic build tools (make, gcc, etc.)

On Ubuntu, the following command should grab everything you need:
``sudo apt-get install build-essential software-properties-common exuberant-ctags``
``sudo apt-get install build-essential software-properties-common universal-ctags``

Bifrost install
~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion tutorial/00_getting_started.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"except ModuleNotFoundError:\n",
" try:\n",
" import google.colab\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy ctypesgen==1.0.2\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure && make -j all && sudo make install)\n",
Expand Down
4 changes: 2 additions & 2 deletions tutorial/01_useful_functions.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"except ModuleNotFoundError:\n",
" try:\n",
" import google.colab\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -526,4 +526,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 2 additions & 2 deletions tutorial/02_building_complexity.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"except ModuleNotFoundError:\n",
" try:\n",
" import google.colab\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -454,4 +454,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 2 additions & 2 deletions tutorial/03_putting_it_together.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"except ModuleNotFoundError:\n",
" try:\n",
" import google.colab\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -316,4 +316,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 2 additions & 2 deletions tutorial/04_pipelines.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
" import google.colab\n",
" except ModuleNotFoundError:\n",
" raise exn\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure --disable-cuda && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -457,4 +457,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 2 additions & 2 deletions tutorial/05_block_logging.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
" import google.colab\n",
" except ModuleNotFoundError:\n",
" raise exn\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure --disable-cuda && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -276,4 +276,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
2 changes: 1 addition & 1 deletion tutorial/06_data_capture.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
" import google.colab\n",
" except ModuleNotFoundError:\n",
" raise exn\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev librdmacm-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev librdmacm-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure --disable-hwloc && make -j all && sudo make install)\n",
Expand Down
4 changes: 2 additions & 2 deletions tutorial/07_high_level_api.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
" import google.colab\n",
" except ModuleNotFoundError:\n",
" raise exn\n",
" !sudo apt-get -qq install exuberant-ctags libopenblas-dev software-properties-common build-essential\n",
" !sudo apt-get -qq install universal-ctags libopenblas-dev software-properties-common build-essential\n",
" !pip install -q contextlib2 pint simplejson scipy git+https://github.com/ctypesgen/ctypesgen.git\n",
" ![ -d ~/bifrost/.git ] || git clone https://github.com/ledatelescope/bifrost ~/bifrost\n",
" !(cd ~/bifrost && ./configure --disable-cuda && make -j all && sudo make install)\n",
Expand Down Expand Up @@ -456,4 +456,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
Loading