From 2e9dc050f1638c8b215a533532d4c9ba16c86d93 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:56:38 -0600 Subject: [PATCH 01/30] use ninja gen --- recipe/bld.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8435513..9c82689 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,10 +3,9 @@ cd build set "PROCESSOR_ARCHITECTURE=AMD64" -cmake -G "NMake Makefiles" ^ +cmake -G "Ninja" ^ -DCMAKE_C_COMPILER=clang-cl ^ -DCMAKE_CXX_COMPILER=clang-cl ^ - -DCMAKE_Fortran_COMPILER=flang ^ -DCMAKE_BUILD_TYPE="Release" ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^ @@ -15,6 +14,6 @@ cmake -G "NMake Makefiles" ^ if errorlevel 1 exit 1 -nmake +cmake --build . if errorlevel 1 exit 1 From 341e7ec061dd26062d5833c22487c81396bc8dc7 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:57:23 -0600 Subject: [PATCH 02/30] update install --- recipe/install_flang.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 65c73be..3fd4ba0 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -1,6 +1,6 @@ cd %SRC_DIR%\build call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 -nmake install +cmake --build . --target install if errorlevel 1 exit 1 rm %LIBRARY_BIN%\flang.dll From db64153fd2e472c2499fccef687f70e699feca5a Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 11:02:33 -0600 Subject: [PATCH 03/30] fix meta --- recipe/meta.yaml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e2e4bfe..b14a6b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,16 @@ {% set clang_variant = os.environ.get('CLANG_VARIANT', 'flang') %} {% set flang_commit = "4ddc948697091af68df0a1c63d18e700af047eba" %} -{% set llvm_version = "5.0.0" %} +{% set llvm_version = "11.0.1" %} {% set version = llvm_version %} {% set sha256 = "7078a7b24bb2b52789fc5551bd6eeee19082e2923e4d49c2834579e51b43ea74" %} -{% set build_number = "20180525" %} +{% set build_number = "20200126" %} package: name: flang version: {{ version }} source: - url: https://github.com/isuruf/flang/archive/{{ flang_commit }}.tar.gz + url: https://github.com/xoviat/flang/archive/{{ flang_commit }}.tar.gz sha256: {{ sha256 }} build: @@ -27,9 +27,8 @@ requirements: - {{ compiler('cxx') }} - cmake - clangdev =={{ llvm_version }} - - openmp =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} - - flang-meta host: test: @@ -46,12 +45,11 @@ outputs: - {{ compiler('cxx') }} - cmake - clangdev =={{ llvm_version }} - - openmp =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} - - flang-meta host: run: - - openmp =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} - name: flang script: install_flang.sh # [unix] @@ -65,13 +63,12 @@ outputs: - {{ compiler('cxx') }} - cmake - clangdev =={{ llvm_version }} - - openmp =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} - - flang-meta host: run: - clangdev =={{ llvm_version }} - - openmp =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} - {{ pin_subpackage('libflang', exact=True) }} test: files: From 5ee15422d125cf2d3bcf2836d163636ae092ec53 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 11:05:04 -0600 Subject: [PATCH 04/30] add ninja --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b14a6b3..6381be0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,6 +26,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake + - ninja - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} @@ -44,6 +45,7 @@ outputs: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake + - ninja - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} @@ -62,6 +64,7 @@ outputs: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake + - ninja - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} From bb5429fcdb4277835ece431e8e4c9d56dd0c67ad Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 11:09:59 -0600 Subject: [PATCH 05/30] try to install sed, gawk --- recipe/bld.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9c82689..f59edca 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,6 +1,11 @@ mkdir build cd build +powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" + +refreshenv +choco install -y sed gawk + set "PROCESSOR_ARCHITECTURE=AMD64" cmake -G "Ninja" ^ From 3b0cb1bc951d27e13e6f784099bebbaf966f4a70 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 11:13:59 -0600 Subject: [PATCH 06/30] set commit --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6381be0..78d3c0c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,8 @@ {% set clang_variant = os.environ.get('CLANG_VARIANT', 'flang') %} -{% set flang_commit = "4ddc948697091af68df0a1c63d18e700af047eba" %} +{% set flang_commit = "e7faf52da9e05f225fb5f751d18927e185e18b40" %} {% set llvm_version = "11.0.1" %} {% set version = llvm_version %} -{% set sha256 = "7078a7b24bb2b52789fc5551bd6eeee19082e2923e4d49c2834579e51b43ea74" %} +{% set sha256 = "e8c7194a46233b33b215e4f1e228753ab56b57cd7ce1a18a681af4be111cef97" %} {% set build_number = "20200126" %} package: From 7cc2897bd49f69229b361d915a97777fbcbfb0b1 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Tue, 26 Jan 2021 17:18:33 +0000 Subject: [PATCH 07/30] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and conda-forge-pinning 2021.01.26.08.41.30 --- .appveyor.yml | 53 --------- .azure-pipelines/azure-pipelines-linux.yml | 40 +++++++ .azure-pipelines/azure-pipelines-win.yml | 110 ++++++++++++++++++ .ci_support/linux_64_.yaml | 23 ++++ .../linux_target_platformlinux-64.yaml | 6 - .ci_support/win_64_.yaml | 12 ++ ...mpilervs2015target_platformwin-64vc14.yaml | 15 --- .circleci/build_steps.sh | 33 ------ .circleci/checkout_merge_commit.sh | 27 ----- .circleci/config.yml | 26 ++--- .circleci/fast_finish_ci_pr_build.sh | 4 - .circleci/run_docker_build.sh | 47 -------- .gitattributes | 18 +++ .github/CODEOWNERS | 1 + .github/CONTRIBUTING.md | 15 --- .github/ISSUE_TEMPLATE.md | 25 ---- .github/PULL_REQUEST_TEMPLATE.md | 18 --- .scripts/build_steps.sh | 53 +++++++++ .scripts/run_docker_build.sh | 91 +++++++++++++++ LICENSE.txt | 2 +- README.md | 64 +++++++--- azure-pipelines.yml | 7 ++ build-locally.py | 75 ++++++++++++ 23 files changed, 494 insertions(+), 271 deletions(-) delete mode 100644 .appveyor.yml create mode 100755 .azure-pipelines/azure-pipelines-linux.yml create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/linux_64_.yaml delete mode 100644 .ci_support/linux_target_platformlinux-64.yaml create mode 100644 .ci_support/win_64_.yaml delete mode 100644 .ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml delete mode 100755 .circleci/build_steps.sh delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh delete mode 100755 .circleci/run_docker_build.sh create mode 100644 .github/CODEOWNERS delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100755 .scripts/build_steps.sh create mode 100755 .scripts/run_docker_build.sh create mode 100644 azure-pipelines.yml create mode 100755 build-locally.py diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 569fd7d..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,53 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". - -environment: - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 - - matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -install: - # If there is a newer build queued for the same PR, cancel this one. - - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda.exe update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Add our channels. - - cmd: conda.exe config --set show_channel_urls true - - cmd: conda.exe config --remove channels defaults - - cmd: conda.exe config --add channels defaults - - cmd: conda.exe config --add channels conda-forge - - # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 - - cmd: run_conda_forge_build_setup - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet -deploy_script: - - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 0000000..adce9a5 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,40 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: linux + pool: + vmImage: ubuntu-16.04 + strategy: + matrix: + linux_64_: + CONFIG: linux_64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + timeoutInMinutes: 360 + + steps: + - script: | + rm -rf /opt/ghc + df -h + displayName: Manage disk space + + # configure qemu binfmt-misc running. This allows us to run docker containers + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: | + export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + .scripts/run_docker_build.sh + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..1fd8ea1 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,110 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: vs2017-win2016 + strategy: + matrix: + win_64_: + CONFIG: win_64_ + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + installOptions: "-c conda-forge" + updateConda: true + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + + # Special cased version setting some more things! + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe (vs2008) + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + condition: not(contains(variables['CONFIG'], 'vs2008')) + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml new file mode 100644 index 0000000..0f6e58e --- /dev/null +++ b/.ci_support/linux_64_.yaml @@ -0,0 +1,23 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image diff --git a/.ci_support/linux_target_platformlinux-64.yaml b/.ci_support/linux_target_platformlinux-64.yaml deleted file mode 100644 index 08018c4..0000000 --- a/.ci_support/linux_target_platformlinux-64.yaml +++ /dev/null @@ -1,6 +0,0 @@ -c_compiler: -- toolchain_c -cxx_compiler: -- toolchain_cxx -target_platform: -- linux-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml new file mode 100644 index 0000000..5875235 --- /dev/null +++ b/.ci_support/win_64_.yaml @@ -0,0 +1,12 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +target_platform: +- win-64 +vc: +- '14' diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml deleted file mode 100644 index 41cfdcd..0000000 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml +++ /dev/null @@ -1,15 +0,0 @@ -c_compiler: -- vs2015 -cxx_compiler: -- vs2015 -pin_run_as_build: - vc: - max_pin: x -target_platform: -- win-64 -vc: -- '14' -zip_keys: -- - c_compiler - - cxx_compiler - - vc diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh deleted file mode 100755 index 1becc90..0000000 --- a/.circleci/build_steps.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail -export PYTHONUNBUFFERED=1 - -cat >~/.condarc < /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index dd1aacb..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,26 +1,24 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + version: 2 jobs: - build_linux_target_platformlinux-64: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_target_platformlinux-64" steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_linux_target_platformlinux-64 + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 3db687a..0000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh deleted file mode 100755 index 1887217..0000000 --- a/.circleci/run_docker_build.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" - exit 1 -fi - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" - -docker run -it \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ - -e CONFIG \ - -e BINSTAR_TOKEN \ - -e HOST_USER_ID \ - condaforge/linux-anvil \ - bash \ - /home/conda/feedstock_root/.circleci/build_steps.sh - -# verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index 974953e..9060b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,21 @@ meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +.scripts/* linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..f66daf5 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @isuruf \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc95334..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d60a25d..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -Checklist -* [ ] Used a fork of the feedstock to propose changes -* [ ] Bumped the build number (if the version is unchanged) -* [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` -* [ ] Ensured the license file is being packaged. - - - - diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh new file mode 100755 index 0000000..aa9727b --- /dev/null +++ b/.scripts/build_steps.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" + +cat >~/.condarc </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" + +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +docker info + +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +export HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" + exit 1 +fi + +if [ -z "${DOCKER_IMAGE}" ]; then + SHYAML_INSTALLED="$(shyaml -h || echo NO)" + if [ "${SHYAML_INSTALLED}" == "NO" ]; then + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + fi +fi + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" + +# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`) +DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" +if [ -z "${CI}" ]; then + DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" +fi + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + -e CONFIG \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -e GIT_BRANCH \ + -e UPLOAD_ON_BRANCH \ + -e CI \ + -e FEEDSTOCK_NAME \ + -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ + -e BINSTAR_TOKEN \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ + $DOCKER_IMAGE \ + bash \ + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + +# verify that the end of the script was reached +test -f "$DONE_CANARY" \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 72dc8fd..5f30279 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2018, conda-forge +Copyright (c) 2015-2020, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 2ea4d8e..0996e97 100644 --- a/README.md +++ b/README.md @@ -5,18 +5,48 @@ Home: http://github.com/flang-compiler/flang Package license: Apache 2.0 -Feedstock license: BSD 3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/flang-feedstock/blob/master/LICENSE.txt) Summary: Flang is a Fortran compiler targeting LLVM. - - Current build status ==================== -[![Linux](https://img.shields.io/circleci/project/github/conda-forge/flang-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/flang-feedstock) -[![Windows](https://img.shields.io/appveyor/ci/conda-forge/flang-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/flang-feedstock/branch/master) -![OSX disabled](https://img.shields.io/badge/OSX-disabled-lightgrey.svg) + + + + + + + +
Azure +
+ + + + + + + + + + + + + + + +
VariantStatus
linux_64 + + variant + +
win_64 + + variant + +
+
+
Current release info ==================== @@ -52,6 +82,8 @@ conda search flang --channel conda-forge About conda-forge ================= +[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) + conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the conda-forge GitHub organization. The conda-forge organization contains one repository @@ -60,13 +92,13 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](http://www.appveyor.com/) -and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) +and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](http://docs.anaconda.org/) channel for Linux, Windows and OSX respectively. +[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance -[conda-smithy](http://github.com/conda-forge/conda-smithy) has been developed. +[conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``. @@ -102,7 +134,13 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string). + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string) - back to 0. \ No newline at end of file + the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + back to 0. + +Feedstock Maintainers +===================== + +* [@isuruf](https://github.com/isuruf/) + diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..baa1c2b --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,7 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py new file mode 100755 index 0000000..3453cfe --- /dev/null +++ b/build-locally.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python3 +# +# This file has been generated by conda-smithy in order to build the recipe +# locally. +# +import os +import glob +import subprocess +from argparse import ArgumentParser + + +def setup_environment(ns): + os.environ["CONFIG"] = ns.config + os.environ["UPLOAD_PACKAGES"] = "False" + if ns.debug: + os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" + if ns.output_id: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id + + +def run_docker_build(ns): + script = ".scripts/run_docker_build.sh" + subprocess.check_call([script]) + + +def verify_config(ns): + valid_configs = { + os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + } + print(f"valid configs are {valid_configs}") + if ns.config in valid_configs: + print("Using " + ns.config + " configuration") + return + elif len(valid_configs) == 1: + ns.config = valid_configs.pop() + print("Found " + ns.config + " configuration") + elif ns.config is None: + print("config not selected, please choose from the following:\n") + selections = list(enumerate(sorted(valid_configs), 1)) + for i, c in selections: + print(f"{i}. {c}") + s = input("\n> ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) + + +def main(args=None): + p = ArgumentParser("build-locally") + p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--debug", + action="store_true", + help="Setup debug environment using `conda debug`", + ) + p.add_argument( + "--output-id", help="If running debug, specify the output to setup." + ) + + ns = p.parse_args(args=args) + verify_config(ns) + setup_environment(ns) + + run_docker_build(ns) + + +if __name__ == "__main__": + main() From df4ad016d57818b28a28c44d1d6635ff48731eaa Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 11:42:35 -0600 Subject: [PATCH 08/30] try set path --- recipe/bld.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index f59edca..d0808cb 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,7 +3,8 @@ cd build powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" -refreshenv +set "path=%path%;C:\ProgramData\chocolatey\bin" + choco install -y sed gawk set "PROCESSOR_ARCHITECTURE=AMD64" From f8dc74a584d896f44dd827079748bb08d68fa15e Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 12:20:18 -0600 Subject: [PATCH 09/30] remove choco --- recipe/bld.bat | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index d0808cb..9c82689 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,12 +1,6 @@ mkdir build cd build -powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" - -set "path=%path%;C:\ProgramData\chocolatey\bin" - -choco install -y sed gawk - set "PROCESSOR_ARCHITECTURE=AMD64" cmake -G "Ninja" ^ From 44e099a86a402e96f972b8a84e5a8bcefb19392e Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 12:21:21 -0600 Subject: [PATCH 10/30] add reqs --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 78d3c0c..221c03c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,8 @@ requirements: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} + - m2-sed + - m2-gawk host: test: @@ -49,6 +51,8 @@ outputs: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} + - m2-sed + - m2-gawk host: run: - llvm-openmp =={{ llvm_version }} @@ -68,6 +72,8 @@ outputs: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - llvmdev =={{ llvm_version }} + - m2-sed + - m2-gawk host: run: - clangdev =={{ llvm_version }} From 02fc7a29d1249db6cbe5d80496bac7557e79e13c Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 12:22:05 -0600 Subject: [PATCH 11/30] update lib names --- recipe/install_libflang.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/install_libflang.bat b/recipe/install_libflang.bat index 5d8f90c..c62594b 100644 --- a/recipe/install_libflang.bat +++ b/recipe/install_libflang.bat @@ -1,3 +1,3 @@ -cp %SRC_DIR%/build/bin/flang.dll %LIBRARY_BIN%\ -cp %SRC_DIR%/build/bin/flangrti.dll %LIBRARY_BIN%\ -cp %SRC_DIR%/build/bin/ompstub.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/libflang.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/libflangrti.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/libompstub.dll %LIBRARY_BIN%\ From 6c280b5862f36a6b0caa034e0a08bf823507baee Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 26 Jan 2021 13:26:55 -0600 Subject: [PATCH 12/30] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 221c03c..6543b78 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,7 +6,7 @@ {% set build_number = "20200126" %} package: - name: flang + name: flang-split version: {{ version }} source: @@ -106,3 +106,4 @@ about: extra: recipe-maintainers: - isuruf + feedstock-name: flang From 17fa490a4e326669d71fdb0356e5e06f5ed356e0 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:17:52 -0600 Subject: [PATCH 13/30] fix prefix path, lib names --- recipe/install_flang.bat | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 3fd4ba0..a3f3a44 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -1,11 +1,15 @@ cd %SRC_DIR%\build call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + +cmake .. -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% +if errorlevel 1 exit 1 + cmake --build . --target install if errorlevel 1 exit 1 -rm %LIBRARY_BIN%\flang.dll -rm %LIBRARY_BIN%\flangrti.dll -rm %LIBRARY_BIN%\ompstub.dll +rm %LIBRARY_BIN%\libflang.dll +rm %LIBRARY_BIN%\libflangrti.dll +rm %LIBRARY_BIN%\libompstub.dll :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d. :: This will allow them to be run on environment activation. From 15f5e431c53257894bd8a92edf49e97e0d401853 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:19:56 -0600 Subject: [PATCH 14/30] add vc --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6543b78..b811612 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,6 +55,7 @@ outputs: - m2-gawk host: run: + - vc 17 # [win] - llvm-openmp =={{ llvm_version }} - name: flang @@ -76,6 +77,7 @@ outputs: - m2-gawk host: run: + - vc 17 # [win] - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - {{ pin_subpackage('libflang', exact=True) }} From 7ca1a97f4d70e3d54ff879849bb16234644c4557 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 14:21:30 -0600 Subject: [PATCH 15/30] fix formatting --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b811612..d8d18b7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,7 +55,7 @@ outputs: - m2-gawk host: run: - - vc 17 # [win] + - vc 17 # [win] - llvm-openmp =={{ llvm_version }} - name: flang @@ -77,7 +77,7 @@ outputs: - m2-gawk host: run: - - vc 17 # [win] + - vc 17 # [win] - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - {{ pin_subpackage('libflang', exact=True) }} From 3799765434f178018d5f1dd07d81bf89db2035db Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 17:37:49 -0600 Subject: [PATCH 16/30] try new fix --- recipe/install_flang.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index a3f3a44..1edb514 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -1,12 +1,14 @@ cd %SRC_DIR%\build call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 -cmake .. -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -if errorlevel 1 exit 1 - cmake --build . --target install if errorlevel 1 exit 1 +powershell -Command "cp $env:LIBRARY_PREFIX\bin\*.exe $env:LIBRARY_BIN" +powershell -Command "cp $env:LIBRARY_PREFIX\lib\*.lib $env:LIBRARY_BIN\..\lib" +powershell -Commnd "mkdir $env:LIBRARY_BIN\..\include\flang" +powershell -Command "cp $env:LIBRARY_PREFIX\include\flang\*.mod $env:LIBRARY_BIN\..\include\flang" + rm %LIBRARY_BIN%\libflang.dll rm %LIBRARY_BIN%\libflangrti.dll rm %LIBRARY_BIN%\libompstub.dll From 131e7c617e869a057439e5400bfcc2246354cd09 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 18:33:24 -0600 Subject: [PATCH 17/30] try new fix --- recipe/install_flang.bat | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 1edb514..8710547 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -4,10 +4,36 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd6 cmake --build . --target install if errorlevel 1 exit 1 -powershell -Command "cp $env:LIBRARY_PREFIX\bin\*.exe $env:LIBRARY_BIN" -powershell -Command "cp $env:LIBRARY_PREFIX\lib\*.lib $env:LIBRARY_BIN\..\lib" -powershell -Commnd "mkdir $env:LIBRARY_BIN\..\include\flang" -powershell -Command "cp $env:LIBRARY_PREFIX\include\flang\*.mod $env:LIBRARY_BIN\..\include\flang" +mkdir %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/ieee_arithmetic.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/ieee_arithmetic_la.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/ieee_exceptions.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/ieee_exceptions_la.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/ieee_features.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/iso_c_binding.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/iso_fortran_env.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/omp_lib.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/omp_lib_kinds.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/__norm2.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/__norm2_i8.mod %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/include/flang/omp_lib.h %LIBRARY_BIN%\..\include\flang +cp %SRC_DIR%/build/lib/flangADT.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/flangArgParser.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/libpgmath.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/pgmath.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/ompstub.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/libompstub.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/bin/libompstub.dll %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/flangrti.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/libflangrti.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/flang.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/libflang.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/lib/flangmain.lib %LIBRARY_BIN%\..\lib +cp %SRC_DIR%/build/bin/libflangrti.dll %LIBRARY_BIN% +cp %SRC_DIR%/build/bin/libflang.dll %LIBRARY_BIN% +cp %SRC_DIR%/build/bin/flang.exe %LIBRARY_BIN% +cp %SRC_DIR%/build/bin/flang1.exe %LIBRARY_BIN% +cp %SRC_DIR%/build/bin/flang2.exe %LIBRARY_BIN% rm %LIBRARY_BIN%\libflang.dll rm %LIBRARY_BIN%\libflangrti.dll From 122365e91cda96fec06dd7fa809df3594d0a7f6d Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 19:10:49 -0600 Subject: [PATCH 18/30] remove vc req --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d8d18b7..6543b78 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,7 +55,6 @@ outputs: - m2-gawk host: run: - - vc 17 # [win] - llvm-openmp =={{ llvm_version }} - name: flang @@ -77,7 +76,6 @@ outputs: - m2-gawk host: run: - - vc 17 # [win] - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} - {{ pin_subpackage('libflang', exact=True) }} From bcc49d6f004026a9b815a08c7967f31640db6db5 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 19:12:05 -0600 Subject: [PATCH 19/30] meta: copy from library prefix --- recipe/install_flang.bat | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 8710547..2f83e1c 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -5,35 +5,35 @@ cmake --build . --target install if errorlevel 1 exit 1 mkdir %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/ieee_arithmetic.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/ieee_arithmetic_la.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/ieee_exceptions.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/ieee_exceptions_la.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/ieee_features.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/iso_c_binding.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/iso_fortran_env.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/omp_lib.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/omp_lib_kinds.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/__norm2.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/__norm2_i8.mod %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/include/flang/omp_lib.h %LIBRARY_BIN%\..\include\flang -cp %SRC_DIR%/build/lib/flangADT.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/flangArgParser.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/libpgmath.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/pgmath.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/ompstub.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/libompstub.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/bin/libompstub.dll %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/flangrti.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/libflangrti.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/flang.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/libflang.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/lib/flangmain.lib %LIBRARY_BIN%\..\lib -cp %SRC_DIR%/build/bin/libflangrti.dll %LIBRARY_BIN% -cp %SRC_DIR%/build/bin/libflang.dll %LIBRARY_BIN% -cp %SRC_DIR%/build/bin/flang.exe %LIBRARY_BIN% -cp %SRC_DIR%/build/bin/flang1.exe %LIBRARY_BIN% -cp %SRC_DIR%/build/bin/flang2.exe %LIBRARY_BIN% +cp %LIBRARY_PREFIX%/include/flang/ieee_arithmetic.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/ieee_arithmetic_la.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/ieee_exceptions.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/ieee_exceptions_la.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/ieee_features.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/iso_c_binding.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/iso_fortran_env.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/omp_lib.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/omp_lib_kinds.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/__norm2.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/__norm2_i8.mod %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/include/flang/omp_lib.h %LIBRARY_BIN%\..\include\flang +cp %LIBRARY_PREFIX%/lib/flangADT.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/flangArgParser.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/libpgmath.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/pgmath.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/ompstub.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/libompstub.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/bin/libompstub.dll %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/flangrti.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/libflangrti.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/flang.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/libflang.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/lib/flangmain.lib %LIBRARY_BIN%\..\lib +cp %LIBRARY_PREFIX%/bin/libflangrti.dll %LIBRARY_BIN% +cp %LIBRARY_PREFIX%/bin/libflang.dll %LIBRARY_BIN% +cp %LIBRARY_PREFIX%/bin/flang.exe %LIBRARY_BIN% +cp %LIBRARY_PREFIX%/bin/flang1.exe %LIBRARY_BIN% +cp %LIBRARY_PREFIX%/bin/flang2.exe %LIBRARY_BIN% rm %LIBRARY_BIN%\libflang.dll rm %LIBRARY_BIN%\libflangrti.dll From 09ad8dcc71a31792906519edb2abffd3eaa6d65d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 26 Jan 2021 19:31:53 -0600 Subject: [PATCH 20/30] Fix host deps --- recipe/meta.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6543b78..02dfe00 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,12 +27,12 @@ requirements: - {{ compiler('cxx') }} - cmake - ninja - - clangdev =={{ llvm_version }} - - llvm-openmp =={{ llvm_version }} - - llvmdev =={{ llvm_version }} - m2-sed - m2-gawk host: + - clangdev =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} + - llvmdev =={{ llvm_version }} test: commands: @@ -48,12 +48,12 @@ outputs: - {{ compiler('cxx') }} - cmake - ninja - - clangdev =={{ llvm_version }} - - llvm-openmp =={{ llvm_version }} - - llvmdev =={{ llvm_version }} - m2-sed - m2-gawk host: + - clangdev =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} + - llvmdev =={{ llvm_version }} run: - llvm-openmp =={{ llvm_version }} @@ -69,12 +69,12 @@ outputs: - {{ compiler('cxx') }} - cmake - ninja - - clangdev =={{ llvm_version }} - - llvm-openmp =={{ llvm_version }} - - llvmdev =={{ llvm_version }} - m2-sed - m2-gawk host: + - clangdev =={{ llvm_version }} + - llvm-openmp =={{ llvm_version }} + - llvmdev =={{ llvm_version }} run: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} From 24be19f11f605158ac89f5f0d2ab9a988380e4f1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 26 Jan 2021 19:32:44 -0600 Subject: [PATCH 21/30] remove unnecessary hacks --- recipe/install_flang.bat | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 2f83e1c..692b3e5 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -4,37 +4,6 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd6 cmake --build . --target install if errorlevel 1 exit 1 -mkdir %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/ieee_arithmetic.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/ieee_arithmetic_la.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/ieee_exceptions.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/ieee_exceptions_la.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/ieee_features.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/iso_c_binding.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/iso_fortran_env.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/omp_lib.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/omp_lib_kinds.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/__norm2.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/__norm2_i8.mod %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/include/flang/omp_lib.h %LIBRARY_BIN%\..\include\flang -cp %LIBRARY_PREFIX%/lib/flangADT.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/flangArgParser.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/libpgmath.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/pgmath.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/ompstub.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/libompstub.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/bin/libompstub.dll %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/flangrti.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/libflangrti.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/flang.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/libflang.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/lib/flangmain.lib %LIBRARY_BIN%\..\lib -cp %LIBRARY_PREFIX%/bin/libflangrti.dll %LIBRARY_BIN% -cp %LIBRARY_PREFIX%/bin/libflang.dll %LIBRARY_BIN% -cp %LIBRARY_PREFIX%/bin/flang.exe %LIBRARY_BIN% -cp %LIBRARY_PREFIX%/bin/flang1.exe %LIBRARY_BIN% -cp %LIBRARY_PREFIX%/bin/flang2.exe %LIBRARY_BIN% - rm %LIBRARY_BIN%\libflang.dll rm %LIBRARY_BIN%\libflangrti.dll rm %LIBRARY_BIN%\libompstub.dll From acea9efbe06d0fb9b8b00224524047d0f7370a45 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 26 Jan 2021 19:37:32 -0600 Subject: [PATCH 22/30] fix m2-* deps --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 02dfe00..9d2d1cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,8 +27,8 @@ requirements: - {{ compiler('cxx') }} - cmake - ninja - - m2-sed - - m2-gawk + - m2-sed # [win] + - m2-gawk # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} @@ -48,8 +48,8 @@ outputs: - {{ compiler('cxx') }} - cmake - ninja - - m2-sed - - m2-gawk + - m2-sed # [win] + - m2-gawk # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} @@ -69,8 +69,8 @@ outputs: - {{ compiler('cxx') }} - cmake - ninja - - m2-sed - - m2-gawk + - m2-sed # [win] + - m2-gawk # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} From 9626f5d971606ef318b1a4da7bdd57e337342580 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:17:34 -0600 Subject: [PATCH 23/30] use new commit --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d2d1cc..1eb6128 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,8 @@ {% set clang_variant = os.environ.get('CLANG_VARIANT', 'flang') %} -{% set flang_commit = "e7faf52da9e05f225fb5f751d18927e185e18b40" %} +{% set flang_commit = "e085e83141d1561eba187b01d173424508a77555" %} {% set llvm_version = "11.0.1" %} {% set version = llvm_version %} -{% set sha256 = "e8c7194a46233b33b215e4f1e228753ab56b57cd7ce1a18a681af4be111cef97" %} +{% set sha256 = "9d95c2427e3afdefb834473a20f9bdab69b8fafd52b5136ff8a3e2a7d25d397e" %} {% set build_number = "20200126" %} package: From f8f44e0cd156d1e64ca13760b231db8346b553b8 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:18:01 -0600 Subject: [PATCH 24/30] change names --- recipe/install_libflang.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/install_libflang.bat b/recipe/install_libflang.bat index c62594b..5d8f90c 100644 --- a/recipe/install_libflang.bat +++ b/recipe/install_libflang.bat @@ -1,3 +1,3 @@ -cp %SRC_DIR%/build/bin/libflang.dll %LIBRARY_BIN%\ -cp %SRC_DIR%/build/bin/libflangrti.dll %LIBRARY_BIN%\ -cp %SRC_DIR%/build/bin/libompstub.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/flang.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/flangrti.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/ompstub.dll %LIBRARY_BIN%\ From 73f1906b3be37b887d7285fad088d865eb071090 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:18:24 -0600 Subject: [PATCH 25/30] change names --- recipe/install_flang.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 692b3e5..145d8e1 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -4,9 +4,9 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd6 cmake --build . --target install if errorlevel 1 exit 1 -rm %LIBRARY_BIN%\libflang.dll -rm %LIBRARY_BIN%\libflangrti.dll -rm %LIBRARY_BIN%\libompstub.dll +rm %LIBRARY_BIN%\flang.dll +rm %LIBRARY_BIN%\flangrti.dll +rm %LIBRARY_BIN%\ompstub.dll :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d. :: This will allow them to be run on environment activation. From 94967b5f1b60397f542a839ae407942e95c06655 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:19:28 -0600 Subject: [PATCH 26/30] add grep --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1eb6128..51c5d07 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,6 +29,7 @@ requirements: - ninja - m2-sed # [win] - m2-gawk # [win] + - m2-grep # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} @@ -50,6 +51,7 @@ outputs: - ninja - m2-sed # [win] - m2-gawk # [win] + - m2-grep # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} @@ -71,6 +73,7 @@ outputs: - ninja - m2-sed # [win] - m2-gawk # [win] + - m2-grep # [win] host: - clangdev =={{ llvm_version }} - llvm-openmp =={{ llvm_version }} From d417714bf25030439d40dbf04a6e73e92c46ad42 Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Wed, 27 Jan 2021 12:51:34 -0600 Subject: [PATCH 27/30] update commit --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 51c5d07..db09c79 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,8 @@ {% set clang_variant = os.environ.get('CLANG_VARIANT', 'flang') %} -{% set flang_commit = "e085e83141d1561eba187b01d173424508a77555" %} +{% set flang_commit = "ce9a7208dbb7b81ffeefd2eeeba055e8a37230cd" %} {% set llvm_version = "11.0.1" %} {% set version = llvm_version %} -{% set sha256 = "9d95c2427e3afdefb834473a20f9bdab69b8fafd52b5136ff8a3e2a7d25d397e" %} +{% set sha256 = "ac9d24b3864f0a979327e3aa1f13cfe0aade1cc9502b1daed53e8c0e9982472e" %} {% set build_number = "20200126" %} package: From 05997fa38224a1a0450a80d92bb506eed96250cc Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Wed, 27 Jan 2021 12:52:19 -0600 Subject: [PATCH 28/30] add pg --- recipe/install_flang.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/install_flang.bat b/recipe/install_flang.bat index 145d8e1..3d64e5d 100644 --- a/recipe/install_flang.bat +++ b/recipe/install_flang.bat @@ -7,6 +7,7 @@ if errorlevel 1 exit 1 rm %LIBRARY_BIN%\flang.dll rm %LIBRARY_BIN%\flangrti.dll rm %LIBRARY_BIN%\ompstub.dll +rm %LIBRARY_BIN%\pgmath.dll :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d. :: This will allow them to be run on environment activation. From ceb94e9eee773caaa687735c7462f438dfb5faae Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Wed, 27 Jan 2021 12:52:46 -0600 Subject: [PATCH 29/30] add pg --- recipe/install_libflang.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/install_libflang.bat b/recipe/install_libflang.bat index 5d8f90c..087c483 100644 --- a/recipe/install_libflang.bat +++ b/recipe/install_libflang.bat @@ -1,3 +1,4 @@ cp %SRC_DIR%/build/bin/flang.dll %LIBRARY_BIN%\ cp %SRC_DIR%/build/bin/flangrti.dll %LIBRARY_BIN%\ cp %SRC_DIR%/build/bin/ompstub.dll %LIBRARY_BIN%\ +cp %SRC_DIR%/build/bin/pgmath.dll %LIBRARY_BIN%\ From 41aab153731defc0f6d02a7ea16e98987e6e6f5e Mon Sep 17 00:00:00 2001 From: xoviat <49173759+xoviat@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:14:39 -0600 Subject: [PATCH 30/30] fix hash --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db09c79..0cc9e75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set flang_commit = "ce9a7208dbb7b81ffeefd2eeeba055e8a37230cd" %} {% set llvm_version = "11.0.1" %} {% set version = llvm_version %} -{% set sha256 = "ac9d24b3864f0a979327e3aa1f13cfe0aade1cc9502b1daed53e8c0e9982472e" %} +{% set sha256 = "d2fb4555b1010ade283bccdd05d72593c5cec936d2c8eb932b62b81d563119ec" %} {% set build_number = "20200126" %} package: