Merge branch 'sage-b-use-make' into remove_patchbot

Author: Matthias Koeppe

src/bin/sage

@@ -193,6 +193,13 @@ if [ "$1" = '--nodotsage' ]; then
     exit $status
 fi
 
+# build_sage, sage -b, sage -br, etc. could also be moved to
+# build/bin/sage-site. See #29111; but OTOH #34627.
+
+build_sage() {
+    ( cd "$SAGE_ROOT" && make sagelib-no-deps ) || exit $?
+}
+
 # Check for '-i' etc. before sourcing sage-env: running "make"
 # should be run outside of the Sage shell.
 case "$1" in
@@ -206,6 +213,28 @@ case "$1" in
         echo >&2 "Error: unknown option: $1"
         exit 1
         ;;
+    -b)
+        build_sage
+        exit 0
+        ;;
+    -br|--br)
+        build_sage
+        shift; set -- -r "$@"  # delegate to handling of "-r" below, after sourcing sage-env
+        ;;
+    -bn|--build-and-notebook)
+        build_sage
+        shift; set -- -n "$@"  # delegate to handling of "-n" below, after sourcing sage-env
+        ;;
+    -ba)
+        ( cd "$SAGE_ROOT" && make sagelib-clean )
+        build_sage
+        exit 0
+        ;;
+    -bt*)
+        build_sage
+        switch_without_b=-${1#-b}
+        shift; set -- $switch_without_b "$@"  # delegate to handling of "-t...." below, after sourcing sage-env
+        ;;
 esac
 
 #####################################################################
@@ -264,7 +293,7 @@ sage_setup() {
         echo >&2 '************************************************************************'
         echo >&2 'It seems that you are attempting to run Sage from an unpacked source'
         echo >&2 'tarball, but you have not compiled it yet (or maybe the build has not'
-        echo >&2 'finished). You should run `make` in the Sage root directory first.'
+        echo >&2 'finished). You should run `make` in the SAGE_ROOT directory first.'
         echo >&2 'If you did not intend to build Sage from source, you should download'
         echo >&2 'a binary tarball instead. Read README.txt for more information.'
         echo >&2 '************************************************************************'
@@ -842,12 +871,6 @@ fi
 # The notebook, grep, building Sage, testing Sage
 #####################################################################
 
-# build_sage, sage -b, sage -br, etc. could be moved to
-# build/bin/sage-site. See #29111.
-
-build_sage() {
-    ( cd "$SAGE_ROOT/build/make" && ./install sagelib-no-deps ) || exit $?
-}
 
 if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
     sage-cleaner &>/dev/null &
@@ -882,47 +905,19 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
     fi
 fi
 
-if [ "$1" = '-b' ]; then
-    build_sage
-    exit $?
-fi
-
-if [ "$1" = '-br' -o "$1" = "--br" ]; then
-    build_sage
-    interactive_sage
-fi
-
 if [ "$1" = '-r' ]; then
     shift
     interactive_sage
 fi
 
-if [ "$1" = '-ba-force' -o "$1" = '--ba-force' ]; then
-    echo
-    echo "WARNING: 'sage --ba-force' is deprecated; use 'sage -ba' instead."
-    echo
-    ( cd "$SAGE_ROOT/build/make" && make sagelib-clean )
-    build_sage
-    exit $?
-fi
-
-if [ "$1" = '-ba' ]; then
-    ( cd "$SAGE_ROOT/build/make" && make sagelib-clean )
-    build_sage
-    exit $?
-fi
-
 exec-runtests() {
     sage_setup
     export PYTHONIOENCODING="utf-8"  # Fix encoding for doctests
     exec sage-runtests "$@"
 }
 
-if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
-    if [ "$1" = '-bt' -o "$1" = '-btp' ]; then
-        build_sage
-    fi
-    if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
+if [ "$1" = '-t' -o "$1" = '-tp' ]; then
+    if [ "$1" = '-tp' ]; then
         shift
         exec-runtests -p "$@"
     else
@@ -931,10 +926,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1" = '-tp' -o "$1" = '-btp' ]; then
     fi
 fi
 
-if [ "$1" = '-tnew' -o "$1" = '-btnew' ]; then
-    if [ "$1" = '-btnew' ]; then
-        build_sage
-    fi
+if [ "$1" = '-tnew' ]; then
     shift
     exec-runtests --new "$@"
 fi

src/setup.py

@@ -85,8 +85,7 @@
     from sage_setup.autogen import autogen_all
     autogen_all()
 
-    log.info("Discovering Python/Cython source code....")
-    t = time.time()
+    log.info("Discovering Python/Cython source code...")
 
     # Exclude a few files if the corresponding distribution is not loaded
     optional_packages = ['mcqd', 'bliss', 'tdlib',
@@ -103,13 +102,19 @@
     python_packages = find_namespace_packages(where=SAGE_SRC, include=['sage', 'sage.*'])
     log.debug(f"python_packages = {python_packages}")
 
-    log.info(f"Discovered Python/Cython sources, time: {(time.time() - t):.2f} seconds.")
+    log.info(f"Discovering Python/Cython source code... done")
 
     # from sage_build_cython:
     import Cython.Compiler.Options
     Cython.Compiler.Options.embed_pos_in_docstring = True
     gdb_debug = os.environ.get('SAGE_DEBUG', None) != 'no'
 
+    aliases = cython_aliases()
+    log.debug(f"aliases = {aliases}")
+    include_path = sage_include_directories(use_sources=True) + ['.']
+    log.debug(f"include_path = {include_path}")
+    nthreads = sage_build_ext_minimal.get_default_number_build_jobs()
+    log.info(f"Cythonizing with {nthreads} threads...")
     try:
         from Cython.Build import cythonize
         from sage.env import cython_aliases, sage_include_directories
@@ -118,16 +123,17 @@
             extensions = cythonize(
                 ["sage/**/*.pyx"],
                 exclude=files_to_exclude,
-                include_path=sage_include_directories(use_sources=True) + ['.'],
+                include_path=include_path,
                 compile_time_env=compile_time_env_variables(),
                 compiler_directives=compiler_directives(False),
-                aliases=cython_aliases(),
+                aliases=aliases,
                 create_extension=create_extension,
                 gdb_debug=gdb_debug,
-                nthreads=4)
+                nthreads=nthreads)
     except Exception as exception:
         log.warn(f"Exception while cythonizing source files: {repr(exception)}")
         raise
+    log.info(f"Cythonizing with {nthreads} threads... done")
 
 # ########################################################
 # ## Distutils