diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e7b9c0e..7a15c85c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: build-essential \ ca-certificates \ curl \ - exuberant-ctags \ + universal-ctags \ gfortran \ git \ libhwloc-dev \ @@ -51,11 +51,11 @@ jobs: run: | brew install \ curl \ - ctags-exuberant \ gawk \ gnu-sed \ hwloc \ - pkg-config + pkg-config \ + universal-ctags - uses: actions/setup-python@v5.0.0 with: python-version: ${{ matrix.python-version }} diff --git a/BifrostDemo.ipynb b/BifrostDemo.ipynb index 8ef5c0cc..ad8bf639 100644 --- a/BifrostDemo.ipynb +++ b/BifrostDemo.ipynb @@ -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" ] }, { diff --git a/README.md b/README.md index feda6c0d..1bc7d2b8 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/configure b/configure index 8582912a..9eca8cda 100755 --- a/configure +++ b/configure @@ -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; } diff --git a/configure.ac b/configure.ac index 618faebb..3bf76313 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml index e0d4ba2b..0589b182 100644 --- a/docs/.readthedocs.yaml +++ b/docs/.readthedocs.yaml @@ -5,7 +5,7 @@ build: apt_packages: - autoconf - doxygen - - exuberant-ctags + - universal-ctags - gawk - gfortran - grep diff --git a/docs/source/Getting-started-guide.rst b/docs/source/Getting-started-guide.rst index c8189cf3..7b55d279 100644 --- a/docs/source/Getting-started-guide.rst +++ b/docs/source/Getting-started-guide.rst @@ -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 ~~~~~~~~~~~~~~~ diff --git a/tutorial/00_getting_started.ipynb b/tutorial/00_getting_started.ipynb index 32f0e7ca..29498c21 100644 --- a/tutorial/00_getting_started.ipynb +++ b/tutorial/00_getting_started.ipynb @@ -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", diff --git a/tutorial/01_useful_functions.ipynb b/tutorial/01_useful_functions.ipynb index bb17f757..c6b4eed8 100644 --- a/tutorial/01_useful_functions.ipynb +++ b/tutorial/01_useful_functions.ipynb @@ -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", @@ -526,4 +526,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} diff --git a/tutorial/02_building_complexity.ipynb b/tutorial/02_building_complexity.ipynb index c0f3ecd0..89b5fb44 100644 --- a/tutorial/02_building_complexity.ipynb +++ b/tutorial/02_building_complexity.ipynb @@ -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", @@ -454,4 +454,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} diff --git a/tutorial/03_putting_it_together.ipynb b/tutorial/03_putting_it_together.ipynb index cb51882e..158656f7 100644 --- a/tutorial/03_putting_it_together.ipynb +++ b/tutorial/03_putting_it_together.ipynb @@ -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", @@ -316,4 +316,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} diff --git a/tutorial/04_pipelines.ipynb b/tutorial/04_pipelines.ipynb index 918432ba..57599259 100644 --- a/tutorial/04_pipelines.ipynb +++ b/tutorial/04_pipelines.ipynb @@ -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", @@ -457,4 +457,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} diff --git a/tutorial/05_block_logging.ipynb b/tutorial/05_block_logging.ipynb index 18054892..6bb0a288 100644 --- a/tutorial/05_block_logging.ipynb +++ b/tutorial/05_block_logging.ipynb @@ -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", @@ -276,4 +276,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} diff --git a/tutorial/06_data_capture.ipynb b/tutorial/06_data_capture.ipynb index 1ae2bd77..51adb1db 100644 --- a/tutorial/06_data_capture.ipynb +++ b/tutorial/06_data_capture.ipynb @@ -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", diff --git a/tutorial/07_high_level_api.ipynb b/tutorial/07_high_level_api.ipynb index 2b383af5..343b4362 100644 --- a/tutorial/07_high_level_api.ipynb +++ b/tutorial/07_high_level_api.ipynb @@ -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", @@ -456,4 +456,4 @@ }, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +}