Changeset 2d0b446 in git


Ignore:
Timestamp:
Feb 23, 2021, 11:27:18 AM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
1d57ef213b0947c87a3f00a2ec18f563d13a13fa
Parents:
0aaff947bac7f5defc09a61304cf2cf83ab6dbede553ba7d16aaa3e3c4c747a4e9bb56c9d7de2a2e
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-02-23 11:27:18+01:00
git-committer:
GitHub <noreply@github.com>2021-02-23 11:27:18+01:00
Message:
Merge pull request #1049 from mkoeppe/update-ci-sage

Update GH Actions workflow ci-sage
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • .github/workflows/ci-sage.yml

    r0aaff9 r2d0b446  
    4343    tags:
    4444      - '*'
     45  workflow_dispatch:
     46    # Allow to run manually
    4547
    4648env:
    … …  
    5658  SAGE_REPO:   sagemath/sage
    5759  SAGE_REF:    develop
    58   # Temporarily test on the branch from sage ticket for singular 4.1.3 upgrade
     60  # Temporarily test on the branch from sage ticket for singular 4.2 upgrade
    5961  SAGE_TRAC_GIT: git://trac.sagemath.org/sage.git
    6062  SAGE_TRAC_COMMAND: try
    … …  
    99101      CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url
    100102      SAGE_FAT_BINARY: yes
     103      SAGE_LOCAL: /opt/sage-singular-${{ github.sha }}
    101104
    102105    runs-on: windows-latest
    … …  
    143146      run: |
    144147        choco --version
    145         PACKAGES=$(sed 's/#.*//;' ./build/pkgs/cygwin.txt ./build/pkgs/cygwin-bootstrap.txt)
     148        PACKAGES="python38 python38-pip"
    146149        choco install $PACKAGES --source cygwin
    147150    - name: Update Sage packages from upstream artifact
    148151      run: |
    149152        C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && ls -l upstream/ && export PATH="$(pwd)/build/bin:$PATH:/usr/local/bin:/usr/bin" && (cd upstream && bash -x update-pkgs.sh) && git diff'
    150     - name: bootstrap
    151       run: |
    152         C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && env && ./bootstrap'
    153     - name: install additional cygwin packages with choco
    154       if: contains(matrix.pkgs, 'standard')
    155       shell: bash {0}
    156       run: |
    157         PACKAGES=$(sed 's/#.*//;' ./build/pkgs/*/distros/cygwin.txt)
    158         choco install $PACKAGES --source cygwin
    159     - name: configure
    160       run: |
    161         C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
    162     - name: make $TARGETS
    163       run: |
    164         C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && make -k -w V=0 base-toolchain && make -k -w V=1 $TARGETS'
    165     - name: make $TARGETS_OPTIONAL
    166       run: |
    167         C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && make -k -w V=1 $TARGETS_OPTIONAL'
     153    - name: tox
     154      run: |
     155        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
     156        C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
    168157    - name: Prepare logs artifact
    169158      shell: bash
    … …  
    185174    - name: Prepare sage-local artifact
    186175      # We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
    187       # We remove the local/lib64 link, which will be recreated by the next stage.
    188       run: |
    189         C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
     176      # We remove the $SAGE_LOCAL/lib64 link, which will be recreated by the next stage.
     177      run: |
     178        C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f "${{ env.SAGE_LOCAL }}"/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files "${{ env.SAGE_LOCAL }}"'
    190179      if: always()
    191180    - uses: actions/upload-artifact@v2
    … …  
    204193      max-parallel: 32
    205194      matrix:
    206         tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386, raspbian-buster-armhf]
     195        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386, raspbian-buster-armhf]
    207196        tox_packages_factor: [minimal, standard]
    208197    env:
    … …  
    235224        run: |
    236225          sudo DEBIAN_FRONTEND=noninteractive apt-get update
    237           sudo DEBIAN_FRONTEND=noninteractive apt-get install python-tox python3-setuptools
     226          sudo DEBIAN_FRONTEND=noninteractive apt-get install tox python3-setuptools
    238227      - name: Update Sage packages from upstream artifact
    239228        run: |
    … …  
    283272      max-parallel: 4
    284273      matrix:
     274        os: [ macos-10.15, macos-11.0 ]
    285275        tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, conda-forge-macos]
    286276        tox_packages_factor: [minimal, standard]
     277        xcode_version_factor: [11.7, default, 12.3]
    287278
    288279    needs: [dist]
    … …  
    290281    env:
    291282      TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
    292       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
     283      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
    293284      DOCKER_TARGETS: configured with-targets with-targets-optional
    294285
    295286    steps:
    296287
     288      - name: Select Xcode version
     289        run: |
     290          if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
    297291      - name: Check out SageMath
    298292        uses: actions/checkout@v2

  • Singular/iparith.cc

    re553ba r2d0b446  
    67156715  id_Delete((ideal *)&I,currRing);
    67166716  res->data = (char *)m;
     6717  return FALSE;
     6718}
     6719static BOOLEAN jjMODULO3(leftv res, leftv u, leftv v, leftv w)
     6720{
     6721  if (w->rtyp!=IDHDL) return TRUE; /* idhdhl required */
     6722  intvec *w_u=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
     6723  tHomog hom=testHomog;
     6724  if (w_u!=NULL)
     6725  {
     6726    w_u=ivCopy(w_u);
     6727    hom=isHomog;
     6728  }
     6729  intvec *w_v=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
     6730  if (w_v!=NULL)
     6731  {
     6732    w_v=ivCopy(w_v);
     6733    hom=isHomog;
     6734  }
     6735  if ((w_u!=NULL) && (w_v==NULL))
     6736    w_v=ivCopy(w_u);
     6737  if ((w_v!=NULL) && (w_u==NULL))
     6738    w_u=ivCopy(w_v);
     6739  ideal u_id=(ideal)u->Data();
     6740  ideal v_id=(ideal)v->Data();
     6741  if (w_u!=NULL)
     6742  {
     6743     if ((*w_u).compare((w_v))!=0)
     6744     {
     6745       WarnS("incompatible weights");
     6746       delete w_u; w_u=NULL;
     6747       hom=testHomog;
     6748     }
     6749     else
     6750     {
     6751       if ((!idTestHomModule(u_id,currRing->qideal,w_v))
     6752       || (!idTestHomModule(v_id,currRing->qideal,w_v)))
     6753       {
     6754         WarnS("wrong weights");
     6755         delete w_u; w_u=NULL;
     6756         hom=testHomog;
     6757       }
     6758     }
     6759  }
     6760  idhdl h=(idhdl)w->data;
     6761  res->data = (char *)idModulo(u_id,v_id ,hom,&w_u, &(h->data.umatrix));
     6762  if (w_u!=NULL)
     6763  {
     6764    atSet(res,omStrDup("isHomog"),w_u,INTVEC_CMD);
     6765  }
     6766  delete w_v;
     6767  //if (TEST_OPT_RETURN_SB) setFlag(res,FLAG_STD);
    67176768  return FALSE;
    67186769}

  • Singular/iparith.inc

    re553ba r2d0b446  
    687687// operation: matrix (module, int, int)  ->  matrix
    688688// operation: matrix (matrix, int, int)  ->  matrix
     689// operation: modulo (ideal, ideal, matrix)  ->  module
     690// operation: modulo (module, module, matrix)  ->  module
    689691// operation: smatrix (module, int, int)  ->  smatrix
    690692// operation: smatrix (smatrix, int, int)  ->  smatrix
    … …  
    14851487  iiArithAddCmd("mod",                 0,  37, '/', 124);
    14861488  iiArithAddCmd("module",              0, 278, 313, 125);
    1487   iiArithAddCmd("modulo",              0, 451, CMD_2, 126);
     1489  iiArithAddCmd("modulo",              0, 451, CMD_23, 126);
    14881490  iiArithAddCmd("monitor",             0, 452, CMD_12, 127);
    14891491  iiArithAddCmd("monomial",            0, 292, CMD_1, 128);

  • Singular/table.h

    re553ba r2d0b446  
    850850,{D(jjMATRIX_Mo),      MATRIX_CMD, MATRIX_CMD, MODUL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
    851851,{D(jjMATRIX_Ma),      MATRIX_CMD, MATRIX_CMD, MATRIX_CMD, INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
     852,{D(jjMODULO3),        MODULO_CMD, MODUL_CMD,  IDEAL_CMD,  IDEAL_CMD,  MATRIX_CMD, ALLOW_NC |ALLOW_RING}
     853,{D(jjMODULO3),        MODULO_CMD, MODUL_CMD,  MODUL_CMD,  MODUL_CMD,  MATRIX_CMD, ALLOW_NC |ALLOW_RING}
    852854,{D(jjSMATRIX_Mo),     SMATRIX_CMD,SMATRIX_CMD,MODUL_CMD,  INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
    853855,{D(jjSMATRIX_Mo),     SMATRIX_CMD,SMATRIX_CMD,SMATRIX_CMD,INT_CMD,    INT_CMD, ALLOW_NC |ALLOW_RING}
    … …  
    11141116  { "mod",         0, '%' ,               MULDIV_OP},
    11151117  { "module",      0, MODUL_CMD ,         RING_DECL_LIST},
    1116   { "modulo",      0, MODULO_CMD ,        CMD_2},
     1118  { "modulo",      0, MODULO_CMD ,        CMD_23},
    11171119  { "monitor",     0, MONITOR_CMD ,       CMD_12},
    11181120  { "monomial",    0, MONOM_CMD ,         CMD_1},

  • kernel/ideals.cc

    re553ba r2d0b446  
    22842284*/
    22852285//ideal idModulo (ideal h2,ideal h1)
    2286 ideal idModulo (ideal h2,ideal h1, tHomog hom, intvec ** w)
     2286ideal idModulo (ideal h2,ideal h1, tHomog hom, intvec ** w, matrix *T)
    22872287{
    22882288  intvec *wtmp=NULL;
     2289  if (T!=NULL) idDelete((ideal*)T);
    22892290
    22902291  int i,k,rk,flength=0,slength,length;
    … …  
    24052406
    24062407  idTest(s_temp);
    2407   unsigned save_opt;
     2408  unsigned save_opt,save_opt2;
    24082409  SI_SAVE_OPT1(save_opt);
     2410  SI_SAVE_OPT2(save_opt2);
    24092411  si_opt_1 |= Sy_bit(OPT_REDTAIL_SYZ);
    24102412  ideal s_temp1 = kStd(s_temp,currRing->qideal,hom,&wtmp,NULL,length);
    24112413  SI_RESTORE_OPT1(save_opt);
     2414  SI_RESTORE_OPT2(save_opt2);
    24122415
    24132416  //if (wtmp!=NULL)  Print("output weights:");wtmp->show(1);PrintLn();
    … …  
    24212424  if (wtmp!=NULL) delete wtmp;
    24222425
    2423   for (i=0;i<IDELEMS(s_temp1);i++)
    2424   {
    2425     if ((s_temp1->m[i]!=NULL)
    2426     && (((int)pGetComp(s_temp1->m[i]))<=length))
    2427     {
    2428       p_Delete(&(s_temp1->m[i]),currRing);
    2429     }
    2430     else
    2431     {
    2432       p_Shift(&(s_temp1->m[i]),-length,currRing);
     2426  if (T==NULL)
     2427  {
     2428    for (i=0;i<IDELEMS(s_temp1);i++)
     2429    {
     2430      if (s_temp1->m[i]!=NULL)
     2431      {
     2432        if (((int)pGetComp(s_temp1->m[i]))<=length)
     2433        {
     2434          p_Delete(&(s_temp1->m[i]),currRing);
     2435        }
     2436        else
     2437        {
     2438          p_Shift(&(s_temp1->m[i]),-length,currRing);
     2439        }
     2440      }
     2441    }
     2442  }
     2443  else
     2444  {
     2445    *T=mpNew(IDELEMS(s_temp1),IDELEMS(h2));
     2446    for (i=0;i<IDELEMS(s_temp1);i++)
     2447    {
     2448      if (s_temp1->m[i]!=NULL)
     2449      {
     2450        if (((int)pGetComp(s_temp1->m[i]))<=length)
     2451        {
     2452          do
     2453          {
     2454            p_LmDelete(&(s_temp1->m[i]),currRing);
     2455          } while((int)pGetComp(s_temp1->m[i])<=length);
     2456          poly q = prMoveR( s_temp1->m[i], syz_ring,orig_ring);
     2457          s_temp1->m[i] = NULL;
     2458          if (q!=NULL)
     2459          {
     2460            q=pReverse(q);
     2461            do
     2462            {
     2463              poly p = q;
     2464              long t=pGetComp(p);
     2465              pIter(q);
     2466              pNext(p) = NULL;
     2467              pSetComp(p,0);
     2468              pSetmComp(p);
     2469              MATELEM(*T,(int)t-length,i) = pAdd(MATELEM(*T,(int)t-k,i),p);
     2470            } while (q != NULL);
     2471          }
     2472        }
     2473        else
     2474        {
     2475          p_Shift(&(s_temp1->m[i]),-length,currRing);
     2476        }
     2477      }
    24332478    }
    24342479  }

  • kernel/ideals.h

    re553ba r2d0b446  
    189189}
    190190
    191 ideal   idModulo (ideal h1,ideal h2, tHomog h=testHomog, intvec ** w=NULL);
     191ideal   idModulo (ideal h1,ideal h2, tHomog h=testHomog, intvec ** w=NULL, matrix *T=NULL);
    192192matrix  idCoeffOfKBase(ideal arg, ideal kbase, poly how);
    193193
Note: See TracChangeset for help on using the changeset viewer.