Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ML: Fix socket references for Windows builds #9849

Merged

Conversation

sskutnik
Copy link
Contributor

This fixes references to the Windows socket library used in the ML package (i.e., properly linking the winsock2.h header and linking to the Windows socket library); this is necessary to get Windows-based msys builds to work.

@trilinos/ @jhux2

Motivation

Somewhat related to #9802, in that it is blocking Trilinos from building on msys2 for a native windows build. (Note: refresh of prior PR, this time based off develop).

Stakeholder Feedback

Testing

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

Copy link
Member

@jhux2 jhux2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm. Thanks for the contribution.

@jhux2
Copy link
Member

jhux2 commented Oct 22, 2021

@trilinos/ml

@jhux2 jhux2 added the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label Oct 22, 2021
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ jhux2 ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job Trilinos_pullrequest_intel_17.0.1 to start: Total Wait = 603

@jhux2 jhux2 added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 22, 2021
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job Trilinos_pullrequest_intel_17.0.1 to start: Total Wait = 603

@trilinos-autotester trilinos-autotester removed the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 22, 2021
@jhux2 jhux2 added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 22, 2021
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5847
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3392
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3910
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 11087
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2548
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1539
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3885
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: python-3

  • Build Num: 521
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Using Repos:

Repo: TRILINOS (sskutnik/Trilinos)
  • Branch: fix_ml_socket_windows
  • SHA: 511cf50
  • Mode: TEST_REPO

Pull Request Author: sskutnik

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5847
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3392
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3910
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 11087
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2548
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1539
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3885
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248

Build Information

Test Name: python-3

  • Build Num: 521
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: ML;system: windows;AT: RETEST;AT: AUTOMERGE
PULLREQUESTNUM 9849
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH fix_ml_socket_windows
TRILINOS_SOURCE_REPO https://github.com/sskutnik/Trilinos
TRILINOS_SOURCE_SHA 511cf50
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA efad248


CDash Test Results for PR# 9849.

@trilinos-autotester trilinos-autotester removed the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 23, 2021
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ jhux2 ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

@trilinos-autotester trilinos-autotester merged commit 9c42161 into trilinos:develop Oct 23, 2021
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 9849: IS A SUCCESS - Pull Request successfully merged

@trilinos-autotester trilinos-autotester removed the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label Oct 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants