[Openmp-commits] [openmp] r338721 - [OMPT] Disable by default on Windows

[Hans Wennborg via Openmp-commits]

Seems to work :-) I've added it back to the Windows packaging script
(r338823) and will include it in the branch builds too.

Thanks!

On Thu, Aug 2, 2018 at 5:01 PM, Hans Wennborg <hans at chromium.org> wrote:
> Thanks! I've merged in r338728 and will take a shot at enabling the
> Windows build again.
>
> On Thu, Aug 2, 2018 at 4:41 PM, Jonas Hahnfeld <hahnjo at hahnjo.de> wrote:
>> + Hans, again
>>
>>
>> On 2018-08-02 16:40, Jonas Hahnfeld wrote:
>>>
>>> Hi Hans,
>>>
>>> we might want to merge this for the release if you want to include the
>>> OpenMP runtime again.
>>>
>>> Cheers,
>>> Jonas
>>>
>>> On 2018-08-02 16:34, Jonas Hahnfeld via Openmp-commits wrote:
>>>>
>>>> Author: hahnfeld
>>>> Date: Thu Aug  2 07:34:08 2018
>>>> New Revision: 338721
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=338721&view=rev
>>>> Log:
>>>> [OMPT] Disable by default on Windows
>>>>
>>>> This is broken per PR36561 and PR36574, so disable it for now until
>>>> somebody interested can take a look. OMPT can still be activated manually
>>>> by passing -DLIBOMP_OMPT_SUPPORT=ON during configuration.
>>>>
>>>> Differential Revision: https://reviews.llvm.org/D50086
>>>>
>>>> Modified:
>>>>     openmp/trunk/README.rst
>>>>     openmp/trunk/runtime/CMakeLists.txt
>>>>
>>>> Modified: openmp/trunk/README.rst
>>>> URL:
>>>>
>>>> http://llvm.org/viewvc/llvm-project/openmp/trunk/README.rst?rev=338721&r1=338720&r2=338721&view=diff
>>>>
>>>> ==============================================================================
>>>> --- openmp/trunk/README.rst (original)
>>>> +++ openmp/trunk/README.rst Thu Aug  2 07:34:08 2018
>>>> @@ -194,7 +194,7 @@ Optional Features
>>>>  **LIBOMP_OMPT_SUPPORT** = ``ON|OFF``
>>>>    Include support for the OpenMP Tools Interface (OMPT).
>>>>    This option is supported and ``ON`` by default for x86, x86_64,
>>>> AArch64, and
>>>> -  PPC64 on Linux*, Windows*, and macOS*.
>>>> +  PPC64 on Linux* and macOS*.
>>>>    This option is ``OFF`` if this feature is not supported for the
>>>> platform.
>>>>
>>>>  **LIBOMP_OMPT_OPTIONAL** = ``ON|OFF``
>>>>
>>>> Modified: openmp/trunk/runtime/CMakeLists.txt
>>>> URL:
>>>>
>>>> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/CMakeLists.txt?rev=338721&r1=338720&r2=338721&view=diff
>>>>
>>>> ==============================================================================
>>>> --- openmp/trunk/runtime/CMakeLists.txt (original)
>>>> +++ openmp/trunk/runtime/CMakeLists.txt Thu Aug  2 07:34:08 2018
>>>> @@ -302,7 +302,7 @@ endif()
>>>>  # OMPT-support defaults to ON for OpenMP 5.0+ and if the requirements in
>>>>  # cmake/config-ix.cmake are fulfilled.
>>>>  set(OMPT_DEFAULT FALSE)
>>>> -if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT))
>>>> +if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT)
>>>> AND (NOT WIN32))
>>>>    set(OMPT_DEFAULT TRUE)
>>>>  endif()
>>>>  set(LIBOMP_OMPT_SUPPORT ${OMPT_DEFAULT} CACHE BOOL
>>>>
>>>>
>>>> _______________________________________________
>>>> Openmp-commits mailing list
>>>> Openmp-commits at lists.llvm.org
>>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/openmp-commits