Resolve merge conflict

Author: HarshvirSandhu

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
           )$
       - id: check-merge-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.5.4
     hooks:
       - id: ruff
         args: ["--fix", "--output-format=full"]

doc/introduction.rst

@@ -157,9 +157,9 @@ to extend PyTensor, please feel free to ask.
    install
    tutorial/index
 
-.. _LISA:  https://mila.umontreal.ca/
+.. _LISA:  https://mila.quebec/en
 .. _Greek mathematician: http://en.wikipedia.org/wiki/Theano_(mathematician)
-.. _numpy: http://numpy.scipy.org/
+.. _numpy: https://numpy.org/
 .. _BLAS: http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms
 
 .. _sympy: http://www.sympy.org/

doc/library/config.rst

@@ -103,14 +103,6 @@ import ``pytensor`` and print the config variable, as in:
 
     String value: either ``'cpu'``
 
-.. attribute:: force_device
-
-    Bool value: either ``True`` or ``False``
-
-    Default: ``False``
-
-    This flag's value cannot be modified during the program execution.
-
 .. attribute:: print_active_device
 
     Bool value: either ``True`` or ``False``
@@ -139,16 +131,6 @@ import ``pytensor`` and print the config variable, as in:
     equal to ``float64`` is created.
     This can be used to help find upcasts to ``float64`` in user code.
 
-.. attribute:: deterministic
-
-    String value: either ``'default'``, ``'more'``
-
-    Default: ``'default'``
-
-    If ``more``, sometimes PyTensor will select :class:`Op` implementations that
-    are more "deterministic", but slower.  See the ``dnn.conv.algo*``
-    flags for more cases.
-
 .. attribute:: allow_gc
 
     Bool value: either ``True`` or ``False``
@@ -373,7 +355,7 @@ import ``pytensor`` and print the config variable, as in:
 
     When ``True``, ignore the first call to an PyTensor function while profiling.
 
-.. attribute:: config.lib__amblibm
+.. attribute:: config.lib__amdlibm
 
     Bool value: either ``True`` or ``False``
 
@@ -412,16 +394,6 @@ import ``pytensor`` and print the config variable, as in:
     ignore it (i.e. ``'ignore'``).
     We suggest never using ``'ignore'`` except during testing.
 
-.. attribute:: assert_no_cpu_op
-
-    String value: ``'ignore'`` or ``'warn'`` or ``'raise'`` or ``'pdb'``
-
-    Default: ``'ignore'``
-
-    If there is a CPU :class:`Op` in the computational graph, depending on its value,
-    this flag can either raise a warning, an exception or drop into the frame
-    with ``pdb``.
-
 .. attribute:: on_shape_error
 
     String value: ``'warn'`` or ``'raise'``
@@ -797,18 +769,3 @@ import ``pytensor`` and print the config variable, as in:
     The verbosity level of the meta-rewriter: ``0`` for silent, ``1`` to only
     warn when PyTensor cannot meta-rewrite an :class:`Op`, ``2`` for full output (e.g.
     timings and the rewrites selected).
-
-
-.. attribute:: config.metaopt__optimizer_excluding
-
-    Default: ``""``
-
-    A list of rewrite tags that we don't want included in the meta-rewriter.
-    Multiple tags are separate by ``':'``.
-
-.. attribute:: config.metaopt__optimizer_including
-
-    Default: ``""``
-
-    A list of rewriter tags to be included during meta-rewriting.
-    Multiple tags are separate by ``':'``.

doc/links.rst

@@ -39,18 +39,18 @@ This is a sort of memo for developers and would-be developers.
 
 .. _git: http://git-scm.com/
 .. _pytest: http://docs.pytest.org/en/latest/
-.. _numpy: http://numpy.scipy.org/
+.. _numpy: https://numpy.org/
 .. _python: http://www.python.org
 .. _scipy: http://scipy.org/
 
 .. _autodiff: http://www.autodiff.org
-.. _boost.python: http://www.boost.org/doc/libs/1_38_0/libs/python/doc/index.html
+.. _boost.python: https://www.boost.org/doc/libs/1_85_0/libs/python/doc/html/index.html
 .. _cython: http://www.cython.org/
 .. _liboil: http://liboil.freedesktop.org/wiki/
 .. _llvm: http://llvm.org/
-.. _networkx: http://networkx.lanl.gov/
-.. _pypy: http://codespeak.net/pypy/dist/pypy/doc/
+.. _networkx: https://networkx.org/
+.. _pypy: https://doc.pypy.org/en/latest/
 .. _swig: http://www.swig.org/
-.. _unpython: http://code.google.com/p/unpython/
-.. _pycppad: http://www.seanet.com/~bradbell/pycppad/index.xml
-.. _shedskin: http://shed-skin.blogspot.com/
+.. _unpython: https://code.google.com/archive/p/unpython/
+.. _pycppad: https://github.com/Simple-Robotics/pycppad
+.. _shedskin: https://shedskin.github.io/shedskin/